Merge tag 'hisi-defconfig-for-4.20' of git://github.com/hisilicon/linux-hisi into...
authorOlof Johansson <olof@lixom.net>
Tue, 25 Sep 2018 18:39:42 +0000 (11:39 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 25 Sep 2018 18:39:42 +0000 (11:39 -0700)
commit478bf0b470987a7d833999ff5066e3752182bf93
tree2565fbc52cfee1c08553cb7250ead632751471d3
parent786bd99c91f50482fb9e2b828b203d7e8acc1b56
parent7265b3d9ddaae3dfbda9b1d1436809a6d1b5da7f
Merge tag 'hisi-defconfig-for-4.20' of git://github.com/hisilicon/linux-hisi into next/defconfig

ARM64: hisilicon: defconfig updates for 4.20

- Enable integrated NIC driver(hns3) for hisilicon SoCs
- Enable PCIe Port bus to support some PCIe features like
  AER, hotplug, PME and DPC

* tag 'hisi-defconfig-for-4.20' of git://github.com/hisilicon/linux-hisi:
  arm64: defconfig: Enable PCIEPORTBUS
  arm64: defconfig: enable HiSilicon HNS3 driver

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm64/configs/defconfig