Merge tag 'hisi-arm64-defconfig-for-5.4' of git://github.com/hisilicon/linux-hisi...
authorArnd Bergmann <arnd@arndb.de>
Tue, 3 Sep 2019 15:10:26 +0000 (17:10 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 3 Sep 2019 15:10:27 +0000 (17:10 +0200)
ARM64: hisilicon: defconfig updates for v5.4

- Enable ACPI_APEI_PCIEAER for the hisilicon D06 board to
  support PCIe AER error report

* tag 'hisi-arm64-defconfig-for-5.4' of git://github.com/hisilicon/linux-hisi:
  arm64: defconfig: Enable CONFIG_ACPI_APEI_PCIEAER

Link: https://lore.kernel.org/r/5D562573.5030604@hisilicon.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1  2 
arch/arm64/configs/defconfig

Simple merge