OSDN Git Service

Merge tag 'hisi-defconfig-for-4.11' of git://github.com/hisilicon/linux-hisi into...
authorOlof Johansson <olof@lixom.net>
Mon, 30 Jan 2017 01:30:09 +0000 (17:30 -0800)
committerOlof Johansson <olof@lixom.net>
Mon, 30 Jan 2017 01:30:09 +0000 (17:30 -0800)
commit4e15a5057b76a5537d05f8d1a26a20fdabc61f02
treedbc57613e70ddf21998eb012aa2654ba94467247
parent8179a77deb17323af44c2bad302caaba31b342c4
parent0f84832fb8f92b06f5e9b33d56836acb340dac53
Merge tag 'hisi-defconfig-for-4.11' of git://github.com/hisilicon/linux-hisi into next/defconfig

ARM64: hisilicon: defconfig updates for 4.11

- Enable ARM_SMMU_V3 in the arm64 defconfig
- Enable NUMA and NUMA_BALANCING in the arm64 defconfig

* tag 'hisi-defconfig-for-4.11' of git://github.com/hisilicon/linux-hisi:
  arm64: defconfig: Enable NUMA and NUMA_BALANCING
  arm64: defconfig: enable SMMUv3 config

Signed-off-by: Olof Johansson <olof@lixom.net>