From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 23 Feb 2017 23:39:32 +0000 (-0800)
Subject: Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm... 
X-Git-Tag: v4.11-rc1~88
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=54fff785db6e44208478ae3b0e5c56b853b3e10d;p=platform%2Fkernel%2Flinux-exynos.git

Merge tag 'armsoc-defconfig' of git://git./linux/kernel/git/arm/arm-soc

Pull ARM SoC defconfig updates from Arnd Bergmann:
 "Defconfig additions, removals, etc. Almost all of them just turn on
  drivers that we want on some platform, usually after the driver has
  been merged into mainline.

  There is now a new defconfig file for tango4"

* tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (44 commits)
  ARM: multi_v7_defconfig: enable pstore configs
  ARM: multi_v7_defconfig: enable some newly added crypto modules
  ARM: davinci_all_defconfig: enable SATA modules
  arm64: defconfig: enable CONFIG_MTD_NAND and CONFIG_MTD_NAND_DENALI_DT
  arm64: defconfig: enable CONFIG_MTD_BLOCK
  ARM: Import tango4_defconfig
  ARM: omap2plus_defconfig: Enable support for RTC M41T80
  ARM: omap2plus_defconfig: Enable support for micrell phys
  ARM: vf610m4: defconfig: enable EXT4 filesystem
  ARM: omap2plus_defconfig: Fix probe errors on UARTs 5 and 6
  arm64: defconfig: Enable NUMA and NUMA_BALANCING
  arm64: defconfig: enable SMMUv3 config
  ARM: davinci_all_defconfig: enable iio
  ARM: Keystone: Enable ARCH_HAS_RESET_CONTROLLER
  ARM: configs: stm32: Add RTC support in STM32 defconfig
  ARM: defconfig: qcom: add APQ8060 DragonBoard devices
  ARM: qcom_defconfig: enable thermal sensors
  ARM: qcom_defconfig: add ahci configs
  ARM: qcom_defconfig: add pcie and atl1c ethernet configs
  ARM: qcom_defconfig: add usb related configs
  ...
---

54fff785db6e44208478ae3b0e5c56b853b3e10d
diff --cc arch/arm/configs/aspeed_g5_defconfig
index 05a16d5,ae4295e..5f660b0
--- a/arch/arm/configs/aspeed_g5_defconfig
+++ b/arch/arm/configs/aspeed_g5_defconfig
@@@ -26,6 -26,8 +26,7 @@@ CONFIG_ARCH_MULTI_V6=
  # CONFIG_ARCH_MULTI_V7 is not set
  CONFIG_ARCH_ASPEED=y
  CONFIG_MACH_ASPEED_G5=y
 -CONFIG_DEBUG_RODATA=y
+ CONFIG_VMSPLIT_2G=y
  CONFIG_AEABI=y
  CONFIG_UACCESS_WITH_MEMCPY=y
  CONFIG_SECCOMP=y
@@@ -80,8 -116,8 +115,9 @@@ CONFIG_DEBUG_LL_UART_8250=
  CONFIG_DEBUG_UART_PHYS=0x1e784000
  CONFIG_DEBUG_UART_VIRT=0xe8784000
  CONFIG_EARLY_PRINTK=y
 -CONFIG_DEBUG_SET_MODULE_RONX=y
 +CONFIG_STRICT_MODULE_RWX=y
 +CONFIG_STRICT_KERNEL_RWX=y
+ CONFIG_CRYPTO_ECHAINIV=y
  # CONFIG_XZ_DEC_X86 is not set
  # CONFIG_XZ_DEC_POWERPC is not set
  # CONFIG_XZ_DEC_IA64 is not set