Merge remote-tracking branch 'origin/master'kernel-4.10.0-0.rc0.git6.1.vanilla.knurd.1.fc26kernel-4.10.0-0.rc0.git6.1.vanilla.knurd.1.fc25kernel-4.10.0-0.rc0.git6.1.vanilla.knurd.1.fc24

35 files changed, 82 insertions, 90 deletions

diff --git a/README.txt b/README.txt
index 6195bb56d..516119838 100644
--- a/README.txt
+++ b/README.txt
@@ -31,30 +31,29 @@ by make verrel
 config heirarchy.
 -----------------
 Instead of having to maintain a config file for every arch variant we build on,
-the kernel spec uses a nested system of configs.  At the top level, is
-config-generic. Add options here that should be present in every possible
-config on all architectures.
-
-Beneath this are per-arch overrides. For example config-x86-generic add
-additional x86 specific options, and also _override_ any options that were
-set in config-generic.
-
-The heirarchy looks like this..
-
-                           config-generic
-                                 |
-                         config-x86-generic
-                         |                |
-             config-x86-32-generic   config-x86-64-generic
-
-An option set in a lower level will override the same option set in one
-of the higher levels.
-
-
-There exist two additional overrides, config-debug, and config-nodebug,
-which override -generic, and the per-arch overrides. It is documented
-further below.
-
+the kernel spec uses a nested system of configs. Each option CONFIG_FOO is
+represented by a single file named CONFIG_FOO which contains the state (=y, =m,
+=n). These options are collected in the folder baseconfig. Architecture specifi
+options are set in nested folders. An option set in a nested folder will
+override the same option set in one of the higher levels.
+
+The individual CONFIG_FOO files only exist in the pkg-git repository. The RPM
+contains kernel-foo.config files which are the result of combining all the
+CONFIG_FOO files. The files are combined by running build_configs.sh. This
+script _must_ be run each time one of the options is changed.
+
+Example flow:
+
+# Enable the option CONFIG_ABC123 as a module for all arches
+echo "CONFIG_ABC123=m" > baseconfig/CONFIG_ABC1234
+# enable the option CONFIG_XYZ321 for only x86
+echo "# CONFIG_XYZ321 is not set" > baseconfig/CONFIG_XYZ321
+echo "CONFIG_XYZ321=m" > baseconfig/x86/CONFIG_XYZ321
+# regenerate the combined config files
+./build_configs.sh
+
+The file config_generation gives a listing of what folders go into each
+config file generated.
 
 debug options.
 --------------
@@ -69,14 +68,11 @@ typically been run already, which sets up the following..
 If we are building for rawhide, 'make debug' has been run, which changes
 the status quo to:
 - We only build one kernel 'kernel'
-- The debug options from 'config-debug' are always turned on.
+- The debug options are always turned on.
 This is done to increase coverage testing, as not many people actually
 run kernel-debug.
 
-To add new debug options, add an option to _both_ config-debug and config-nodebug,
-and also new stanzas to the Makefile 'debug' and 'release' targets.
-
-Sometimes debug options get added to config-generic, or per-arch overrides
-instead of config-[no]debug. In this instance, the options should have no
-discernable performance impact, otherwise they belong in the debug files.
-
+The debug options are managed in a separate heierarchy under debugconfig. This
+works in a similar manner to baseconfig. More deeply nested folders, again,
+override options. The file config_generation gives a listing of what folders
+go into each config file generated.
diff --git a/baseconfig/CONFIG_ARC_EMAC b/baseconfig/CONFIG_ARC_EMAC
deleted file mode 100644
index 7fa1bd3e7..000000000
--- a/baseconfig/CONFIG_ARC_EMAC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARC_EMAC=m
diff --git a/baseconfig/CONFIG_MFD_AC100 b/baseconfig/CONFIG_MFD_AC100
deleted file mode 100644
index efd609390..000000000
--- a/baseconfig/CONFIG_MFD_AC100
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_AC100 is not set
diff --git a/baseconfig/CONFIG_MFD_SUN4I_GPADC b/baseconfig/CONFIG_MFD_SUN4I_GPADC
new file mode 100644
index 000000000..d156cb188
--- /dev/null
+++ b/baseconfig/CONFIG_MFD_SUN4I_GPADC
@@ -0,0 +1 @@
+CONFIG_MFD_SUN4I_GPADC=m
diff --git a/baseconfig/arm/CONFIG_MFD_AC100 b/baseconfig/arm/CONFIG_MFD_AC100
new file mode 100644
index 000000000..4decbd23b
--- /dev/null
+++ b/baseconfig/arm/CONFIG_MFD_AC100
@@ -0,0 +1 @@
+CONFIG_MFD_AC100=m
diff --git a/baseconfig/arm/CONFIG_RTC_DRV_AC100 b/baseconfig/arm/CONFIG_RTC_DRV_AC100
new file mode 100644
index 000000000..3fbf952f3
--- /dev/null
+++ b/baseconfig/arm/CONFIG_RTC_DRV_AC100
@@ -0,0 +1 @@
+CONFIG_RTC_DRV_AC100=m
diff --git a/baseconfig/arm/arm64/CONFIG_SUNXI_RSB b/baseconfig/arm/CONFIG_SUNXI_RSB
index 64558bbea..64558bbea 100644
--- a/baseconfig/arm/arm64/CONFIG_SUNXI_RSB
+++ b/baseconfig/arm/CONFIG_SUNXI_RSB
diff --git a/baseconfig/arm/arm64/CONFIG_PINCTRL_QDF2XXX b/baseconfig/arm/arm64/CONFIG_PINCTRL_QDF2XXX
index 20e24a87a..e8dca820d 100644
--- a/baseconfig/arm/arm64/CONFIG_PINCTRL_QDF2XXX
+++ b/baseconfig/arm/arm64/CONFIG_PINCTRL_QDF2XXX
@@ -1 +1 @@
-# CONFIG_PINCTRL_QDF2XXX is not set
+CONFIG_PINCTRL_QDF2XXX=y
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_HIDMA b/baseconfig/arm/arm64/CONFIG_QCOM_HIDMA
new file mode 100644
index 000000000..a5442952f
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_QCOM_HIDMA
@@ -0,0 +1 @@
+CONFIG_QCOM_HIDMA=m
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_HIDMA_MGMT b/baseconfig/arm/arm64/CONFIG_QCOM_HIDMA_MGMT
new file mode 100644
index 000000000..8085b2ae4
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_QCOM_HIDMA_MGMT
@@ -0,0 +1 @@
+CONFIG_QCOM_HIDMA_MGMT=m
diff --git a/baseconfig/arm/armv7/CONFIG_SERIAL_STM32 b/baseconfig/arm/armv7/CONFIG_SERIAL_STM32
deleted file mode 100644
index 7d5df429e..000000000
--- a/baseconfig/arm/armv7/CONFIG_SERIAL_STM32
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SERIAL_STM32 is not set
diff --git a/baseconfig/arm/armv7/CONFIG_SUNXI_RSB b/baseconfig/arm/armv7/CONFIG_SUNXI_RSB
deleted file mode 100644
index 64558bbea..000000000
--- a/baseconfig/arm/armv7/CONFIG_SUNXI_RSB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SUNXI_RSB=m
diff --git a/gitrev b/gitrev
index 443c388dd..2408058e0 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-b0b3a37b908b5906524c11f3ca12cd7c9d4adc1c
+e93b1cc8a8965da137ffea0b88e5f62fa1d2a9e6
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index f477032d6..fe38d780b 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -205,7 +205,6 @@ CONFIG_APQ_GCC_8084=m
 CONFIG_APQ_MMCC_8084=m
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AR5523=m
-CONFIG_ARC_EMAC=m
 # CONFIG_ARCH_ALPINE is not set
 # CONFIG_ARCH_BCM_21664 is not set
 # CONFIG_ARCH_BCM_23550 is not set
@@ -2817,7 +2816,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
-# CONFIG_MFD_AC100 is not set
+CONFIG_MFD_AC100=m
 # CONFIG_MFD_ACT8945A is not set
 # CONFIG_MFD_ARIZONA_I2C is not set
 # CONFIG_MFD_ARIZONA is not set
@@ -2875,6 +2874,7 @@ CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SM501=m
 CONFIG_MFD_SPMI_PMIC=m
 # CONFIG_MFD_STMPE is not set
+CONFIG_MFD_SUN4I_GPADC=m
 CONFIG_MFD_SUN6I_PRCM=y
 # CONFIG_MFD_SYSCON is not set
 # CONFIG_MFD_TC3589X is not set
@@ -3882,7 +3882,7 @@ CONFIG_PINCTRL_MSM=y
 CONFIG_PINCTRL_MVEBU=y
 CONFIG_PINCTRL_QCOM_SPMI_PMIC=m
 # CONFIG_PINCTRL_QCOM_SSBI_PMIC is not set
-# CONFIG_PINCTRL_QDF2XXX is not set
+CONFIG_PINCTRL_QDF2XXX=y
 CONFIG_PINCTRL_SINGLE=y
 # CONFIG_PINCTRL_SUNRISEPOINT is not set
 # CONFIG_PINCTRL_SX150X is not set
@@ -3999,8 +3999,8 @@ CONFIG_QCOM_COINCELL=m
 # CONFIG_QCOM_EBI2 is not set
 CONFIG_QCOM_EMAC=m
 CONFIG_QCOM_GSBI=y
-# CONFIG_QCOM_HIDMA is not set
-# CONFIG_QCOM_HIDMA_MGMT is not set
+CONFIG_QCOM_HIDMA=m
+CONFIG_QCOM_HIDMA_MGMT=m
 # CONFIG_QCOM_Q6V5_PIL is not set
 CONFIG_QCOM_QFPROM=m
 CONFIG_QCOM_SMD=m
@@ -4232,6 +4232,7 @@ CONFIG_RTC_DRV_88PM80X=m
 # CONFIG_RTC_DRV_AB3100 is not set
 # CONFIG_RTC_DRV_ABB5ZES3 is not set
 CONFIG_RTC_DRV_ABX80X=m
+CONFIG_RTC_DRV_AC100=m
 CONFIG_RTC_DRV_ARMADA38X=m
 CONFIG_RTC_DRV_BQ32K=m
 CONFIG_RTC_DRV_BQ4802=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index ba0734476..eaf27dd5a 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -205,7 +205,6 @@ CONFIG_APQ_GCC_8084=m
 CONFIG_APQ_MMCC_8084=m
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AR5523=m
-CONFIG_ARC_EMAC=m
 # CONFIG_ARCH_ALPINE is not set
 # CONFIG_ARCH_BCM_21664 is not set
 # CONFIG_ARCH_BCM_23550 is not set
@@ -2797,7 +2796,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
-# CONFIG_MFD_AC100 is not set
+CONFIG_MFD_AC100=m
 # CONFIG_MFD_ACT8945A is not set
 # CONFIG_MFD_ARIZONA_I2C is not set
 # CONFIG_MFD_ARIZONA is not set
@@ -2855,6 +2854,7 @@ CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SM501=m
 CONFIG_MFD_SPMI_PMIC=m
 # CONFIG_MFD_STMPE is not set
+CONFIG_MFD_SUN4I_GPADC=m
 CONFIG_MFD_SUN6I_PRCM=y
 # CONFIG_MFD_SYSCON is not set
 # CONFIG_MFD_TC3589X is not set
@@ -3861,7 +3861,7 @@ CONFIG_PINCTRL_MSM=y
 CONFIG_PINCTRL_MVEBU=y
 CONFIG_PINCTRL_QCOM_SPMI_PMIC=m
 # CONFIG_PINCTRL_QCOM_SSBI_PMIC is not set
-# CONFIG_PINCTRL_QDF2XXX is not set
+CONFIG_PINCTRL_QDF2XXX=y
 CONFIG_PINCTRL_SINGLE=y
 # CONFIG_PINCTRL_SUNRISEPOINT is not set
 # CONFIG_PINCTRL_SX150X is not set
@@ -3977,8 +3977,8 @@ CONFIG_QCOM_COINCELL=m
 # CONFIG_QCOM_EBI2 is not set
 CONFIG_QCOM_EMAC=m
 CONFIG_QCOM_GSBI=y
-# CONFIG_QCOM_HIDMA is not set
-# CONFIG_QCOM_HIDMA_MGMT is not set
+CONFIG_QCOM_HIDMA=m
+CONFIG_QCOM_HIDMA_MGMT=m
 # CONFIG_QCOM_Q6V5_PIL is not set
 CONFIG_QCOM_QFPROM=m
 CONFIG_QCOM_SMD=m
@@ -4210,6 +4210,7 @@ CONFIG_RTC_DRV_88PM80X=m
 # CONFIG_RTC_DRV_AB3100 is not set
 # CONFIG_RTC_DRV_ABB5ZES3 is not set
 CONFIG_RTC_DRV_ABX80X=m
+CONFIG_RTC_DRV_AC100=m
 CONFIG_RTC_DRV_ARMADA38X=m
 CONFIG_RTC_DRV_BQ32K=m
 CONFIG_RTC_DRV_BQ4802=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 3032a00b2..f9b3af4ff 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -188,7 +188,6 @@ CONFIG_APQ_GCC_8084=m
 CONFIG_APQ_MMCC_8084=m
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AR5523=m
-CONFIG_ARC_EMAC=m
 # CONFIG_ARCH_ALPINE is not set
 # CONFIG_ARCH_ARTPEC is not set
 # CONFIG_ARCH_AT91 is not set
@@ -3053,7 +3052,7 @@ CONFIG_MFD_88PM800=m
 CONFIG_MFD_88PM805=m
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_AAT2870_CORE is not set
-# CONFIG_MFD_AC100 is not set
+CONFIG_MFD_AC100=m
 # CONFIG_MFD_ACT8945A is not set
 # CONFIG_MFD_ARIZONA_I2C is not set
 # CONFIG_MFD_ARIZONA is not set
@@ -3122,6 +3121,7 @@ CONFIG_MFD_SM501=m
 # CONFIG_MFD_SMSC is not set
 CONFIG_MFD_SPMI_PMIC=m
 CONFIG_MFD_STMPE=y
+CONFIG_MFD_SUN4I_GPADC=m
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_T7L66XB=y
 # CONFIG_MFD_TC3589X is not set
@@ -4625,6 +4625,7 @@ CONFIG_RTC_DRV_88PM80X=m
 # CONFIG_RTC_DRV_AB3100 is not set
 # CONFIG_RTC_DRV_ABB5ZES3 is not set
 CONFIG_RTC_DRV_ABX80X=m
+CONFIG_RTC_DRV_AC100=m
 CONFIG_RTC_DRV_ARMADA38X=m
 CONFIG_RTC_DRV_AS3722=y
 CONFIG_RTC_DRV_BQ32K=m
@@ -5154,7 +5155,6 @@ CONFIG_SERIAL_SAMSUNG=y
 # CONFIG_SERIAL_SC16IS7XX is not set
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_ST_ASC is not set
-# CONFIG_SERIAL_STM32 is not set
 CONFIG_SERIAL_TEGRA=y
 # CONFIG_SERIAL_TIMBERDALE is not set
 CONFIG_SERIAL_UARTLITE_CONSOLE=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index b643a5e40..c78ec2d83 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -184,7 +184,6 @@ CONFIG_APM_POWER=m
 # CONFIG_APPLICOM is not set
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AR5523=m
-CONFIG_ARC_EMAC=m
 # CONFIG_ARCH_ALPINE is not set
 # CONFIG_ARCH_ARTPEC is not set
 # CONFIG_ARCH_AT91 is not set
@@ -2928,7 +2927,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_AAT2870_CORE is not set
-# CONFIG_MFD_AC100 is not set
+CONFIG_MFD_AC100=m
 # CONFIG_MFD_ACT8945A is not set
 # CONFIG_MFD_ARIZONA_I2C is not set
 # CONFIG_MFD_ARIZONA is not set
@@ -2995,6 +2994,7 @@ CONFIG_MFD_SM501=m
 # CONFIG_MFD_SMSC is not set
 CONFIG_MFD_SPMI_PMIC=m
 # CONFIG_MFD_STMPE is not set
+CONFIG_MFD_SUN4I_GPADC=m
 CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_T7L66XB is not set
 # CONFIG_MFD_TC3589X is not set
@@ -4374,6 +4374,7 @@ CONFIG_RTC_DRV_88PM80X=m
 # CONFIG_RTC_DRV_AB3100 is not set
 # CONFIG_RTC_DRV_ABB5ZES3 is not set
 CONFIG_RTC_DRV_ABX80X=m
+CONFIG_RTC_DRV_AC100=m
 CONFIG_RTC_DRV_ARMADA38X=m
 CONFIG_RTC_DRV_AS3722=y
 CONFIG_RTC_DRV_BQ32K=m
@@ -4879,7 +4880,6 @@ CONFIG_SERIAL_SAMSUNG=y
 # CONFIG_SERIAL_SC16IS7XX is not set
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_ST_ASC is not set
-# CONFIG_SERIAL_STM32 is not set
 CONFIG_SERIAL_TEGRA=y
 # CONFIG_SERIAL_TIMBERDALE is not set
 # CONFIG_SERIAL_UARTLITE is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 4edcafa5c..106a7a35d 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -184,7 +184,6 @@ CONFIG_APM_POWER=m
 # CONFIG_APPLICOM is not set
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AR5523=m
-CONFIG_ARC_EMAC=m
 # CONFIG_ARCH_ALPINE is not set
 # CONFIG_ARCH_ARTPEC is not set
 # CONFIG_ARCH_AT91 is not set
@@ -2909,7 +2908,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_AAT2870_CORE is not set
-# CONFIG_MFD_AC100 is not set
+CONFIG_MFD_AC100=m
 # CONFIG_MFD_ACT8945A is not set
 # CONFIG_MFD_ARIZONA_I2C is not set
 # CONFIG_MFD_ARIZONA is not set
@@ -2976,6 +2975,7 @@ CONFIG_MFD_SM501=m
 # CONFIG_MFD_SMSC is not set
 CONFIG_MFD_SPMI_PMIC=m
 # CONFIG_MFD_STMPE is not set
+CONFIG_MFD_SUN4I_GPADC=m
 CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_T7L66XB is not set
 # CONFIG_MFD_TC3589X is not set
@@ -4353,6 +4353,7 @@ CONFIG_RTC_DRV_88PM80X=m
 # CONFIG_RTC_DRV_AB3100 is not set
 # CONFIG_RTC_DRV_ABB5ZES3 is not set
 CONFIG_RTC_DRV_ABX80X=m
+CONFIG_RTC_DRV_AC100=m
 CONFIG_RTC_DRV_ARMADA38X=m
 CONFIG_RTC_DRV_AS3722=y
 CONFIG_RTC_DRV_BQ32K=m
@@ -4858,7 +4859,6 @@ CONFIG_SERIAL_SAMSUNG=y
 # CONFIG_SERIAL_SC16IS7XX is not set
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_ST_ASC is not set
-# CONFIG_SERIAL_STM32 is not set
 CONFIG_SERIAL_TEGRA=y
 # CONFIG_SERIAL_TIMBERDALE is not set
 # CONFIG_SERIAL_UARTLITE is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 680b6fafb..2bc07b94d 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -188,7 +188,6 @@ CONFIG_APQ_GCC_8084=m
 CONFIG_APQ_MMCC_8084=m
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AR5523=m
-CONFIG_ARC_EMAC=m
 # CONFIG_ARCH_ALPINE is not set
 # CONFIG_ARCH_ARTPEC is not set
 # CONFIG_ARCH_AT91 is not set
@@ -3034,7 +3033,7 @@ CONFIG_MFD_88PM800=m
 CONFIG_MFD_88PM805=m
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_AAT2870_CORE is not set
-# CONFIG_MFD_AC100 is not set
+CONFIG_MFD_AC100=m
 # CONFIG_MFD_ACT8945A is not set
 # CONFIG_MFD_ARIZONA_I2C is not set
 # CONFIG_MFD_ARIZONA is not set
@@ -3103,6 +3102,7 @@ CONFIG_MFD_SM501=m
 # CONFIG_MFD_SMSC is not set
 CONFIG_MFD_SPMI_PMIC=m
 CONFIG_MFD_STMPE=y
+CONFIG_MFD_SUN4I_GPADC=m
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_T7L66XB=y
 # CONFIG_MFD_TC3589X is not set
@@ -4604,6 +4604,7 @@ CONFIG_RTC_DRV_88PM80X=m
 # CONFIG_RTC_DRV_AB3100 is not set
 # CONFIG_RTC_DRV_ABB5ZES3 is not set
 CONFIG_RTC_DRV_ABX80X=m
+CONFIG_RTC_DRV_AC100=m
 CONFIG_RTC_DRV_ARMADA38X=m
 CONFIG_RTC_DRV_AS3722=y
 CONFIG_RTC_DRV_BQ32K=m
@@ -5133,7 +5134,6 @@ CONFIG_SERIAL_SAMSUNG=y
 # CONFIG_SERIAL_SC16IS7XX is not set
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_ST_ASC is not set
-# CONFIG_SERIAL_STM32 is not set
 CONFIG_SERIAL_TEGRA=y
 # CONFIG_SERIAL_TIMBERDALE is not set
 CONFIG_SERIAL_UARTLITE_CONSOLE=y
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 109650fea..838de57ec 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -222,7 +222,6 @@ CONFIG_APPLE_PROPERTIES=y
 # CONFIG_APPLICOM is not set
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AR5523=m
-CONFIG_ARC_EMAC=m
 # CONFIG_ARCH_TEGRA_186_SOC is not set
 # CONFIG_ARCNET is not set
 # CONFIG_ARM64_PTDUMP is not set
@@ -2763,7 +2762,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_AAT2870_CORE is not set
-# CONFIG_MFD_AC100 is not set
 # CONFIG_MFD_ACT8945A is not set
 # CONFIG_MFD_ARIZONA_I2C is not set
 # CONFIG_MFD_ARIZONA is not set
@@ -2828,6 +2826,7 @@ CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SM501=m
 # CONFIG_MFD_SMSC is not set
 # CONFIG_MFD_STMPE is not set
+CONFIG_MFD_SUN4I_GPADC=m
 # CONFIG_MFD_SYSCON is not set
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6393XB is not set
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 49dd7e3ff..a34d80a35 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -222,7 +222,6 @@ CONFIG_APPLE_PROPERTIES=y
 # CONFIG_APPLICOM is not set
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AR5523=m
-CONFIG_ARC_EMAC=m
 # CONFIG_ARCH_TEGRA_186_SOC is not set
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_PTDUMP=y
@@ -2782,7 +2781,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_AAT2870_CORE is not set
-# CONFIG_MFD_AC100 is not set
 # CONFIG_MFD_ACT8945A is not set
 # CONFIG_MFD_ARIZONA_I2C is not set
 # CONFIG_MFD_ARIZONA is not set
@@ -2847,6 +2845,7 @@ CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SM501=m
 # CONFIG_MFD_SMSC is not set
 # CONFIG_MFD_STMPE is not set
+CONFIG_MFD_SUN4I_GPADC=m
 # CONFIG_MFD_SYSCON is not set
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6393XB is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 698c7da75..60c9bab1a 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -222,7 +222,6 @@ CONFIG_APPLE_PROPERTIES=y
 # CONFIG_APPLICOM is not set
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AR5523=m
-CONFIG_ARC_EMAC=m
 # CONFIG_ARCH_TEGRA_186_SOC is not set
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_PTDUMP=y
@@ -2782,7 +2781,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_AAT2870_CORE is not set
-# CONFIG_MFD_AC100 is not set
 # CONFIG_MFD_ACT8945A is not set
 # CONFIG_MFD_ARIZONA_I2C is not set
 # CONFIG_MFD_ARIZONA is not set
@@ -2847,6 +2845,7 @@ CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SM501=m
 # CONFIG_MFD_SMSC is not set
 # CONFIG_MFD_STMPE is not set
+CONFIG_MFD_SUN4I_GPADC=m
 # CONFIG_MFD_SYSCON is not set
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6393XB is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index 2e70a61d3..77c8cb868 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -222,7 +222,6 @@ CONFIG_APPLE_PROPERTIES=y
 # CONFIG_APPLICOM is not set
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AR5523=m
-CONFIG_ARC_EMAC=m
 # CONFIG_ARCH_TEGRA_186_SOC is not set
 # CONFIG_ARCNET is not set
 # CONFIG_ARM64_PTDUMP is not set
@@ -2763,7 +2762,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_AAT2870_CORE is not set
-# CONFIG_MFD_AC100 is not set
 # CONFIG_MFD_ACT8945A is not set
 # CONFIG_MFD_ARIZONA_I2C is not set
 # CONFIG_MFD_ARIZONA is not set
@@ -2828,6 +2826,7 @@ CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SM501=m
 # CONFIG_MFD_SMSC is not set
 # CONFIG_MFD_STMPE is not set
+CONFIG_MFD_SUN4I_GPADC=m
 # CONFIG_MFD_SYSCON is not set
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6393XB is not set
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 0c5039eb4..22fad5ed1 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -184,7 +184,6 @@ CONFIG_APPLE_AIRPORT=m
 # CONFIG_APPLICOM is not set
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AR5523=m
-CONFIG_ARC_EMAC=m
 # CONFIG_ARCH_TEGRA_186_SOC is not set
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_PTDUMP=y
@@ -2674,7 +2673,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_AAT2870_CORE is not set
-# CONFIG_MFD_AC100 is not set
 # CONFIG_MFD_ACT8945A is not set
 # CONFIG_MFD_ARIZONA_I2C is not set
 # CONFIG_MFD_ARIZONA is not set
@@ -2728,6 +2726,7 @@ CONFIG_MFD_RTSX_USB=m
 CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SM501=m
 # CONFIG_MFD_STMPE is not set
+CONFIG_MFD_SUN4I_GPADC=m
 # CONFIG_MFD_SYSCON is not set
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6393XB is not set
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 0e1fea869..eab8de1bd 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -184,7 +184,6 @@ CONFIG_APPLE_AIRPORT=m
 # CONFIG_APPLICOM is not set
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AR5523=m
-CONFIG_ARC_EMAC=m
 # CONFIG_ARCH_TEGRA_186_SOC is not set
 # CONFIG_ARCNET is not set
 # CONFIG_ARM64_PTDUMP is not set
@@ -2654,7 +2653,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_AAT2870_CORE is not set
-# CONFIG_MFD_AC100 is not set
 # CONFIG_MFD_ACT8945A is not set
 # CONFIG_MFD_ARIZONA_I2C is not set
 # CONFIG_MFD_ARIZONA is not set
@@ -2708,6 +2706,7 @@ CONFIG_MFD_RTSX_USB=m
 CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SM501=m
 # CONFIG_MFD_STMPE is not set
+CONFIG_MFD_SUN4I_GPADC=m
 # CONFIG_MFD_SYSCON is not set
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6393XB is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 3c92cb3aa..1db893489 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -178,7 +178,6 @@ CONFIG_APM_POWER=m
 # CONFIG_APPLICOM is not set
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AR5523=m
-CONFIG_ARC_EMAC=m
 # CONFIG_ARCH_TEGRA_186_SOC is not set
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_PTDUMP=y
@@ -2620,7 +2619,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_AAT2870_CORE is not set
-# CONFIG_MFD_AC100 is not set
 # CONFIG_MFD_ACT8945A is not set
 # CONFIG_MFD_ARIZONA_I2C is not set
 # CONFIG_MFD_ARIZONA is not set
@@ -2674,6 +2672,7 @@ CONFIG_MFD_RTSX_USB=m
 CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SM501=m
 # CONFIG_MFD_STMPE is not set
+CONFIG_MFD_SUN4I_GPADC=m
 # CONFIG_MFD_SYSCON is not set
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6393XB is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 58f1fda2b..da5be09e8 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -178,7 +178,6 @@ CONFIG_APM_POWER=m
 # CONFIG_APPLICOM is not set
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AR5523=m
-CONFIG_ARC_EMAC=m
 # CONFIG_ARCH_TEGRA_186_SOC is not set
 # CONFIG_ARCNET is not set
 # CONFIG_ARM64_PTDUMP is not set
@@ -2600,7 +2599,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_AAT2870_CORE is not set
-# CONFIG_MFD_AC100 is not set
 # CONFIG_MFD_ACT8945A is not set
 # CONFIG_MFD_ARIZONA_I2C is not set
 # CONFIG_MFD_ARIZONA is not set
@@ -2654,6 +2652,7 @@ CONFIG_MFD_RTSX_USB=m
 CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SM501=m
 # CONFIG_MFD_STMPE is not set
+CONFIG_MFD_SUN4I_GPADC=m
 # CONFIG_MFD_SYSCON is not set
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6393XB is not set
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index aa08263b1..7e51b08bf 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -178,7 +178,6 @@ CONFIG_APM_POWER=m
 # CONFIG_APPLICOM is not set
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AR5523=m
-CONFIG_ARC_EMAC=m
 # CONFIG_ARCH_TEGRA_186_SOC is not set
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_PTDUMP=y
@@ -2619,7 +2618,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_AAT2870_CORE is not set
-# CONFIG_MFD_AC100 is not set
 # CONFIG_MFD_ACT8945A is not set
 # CONFIG_MFD_ARIZONA_I2C is not set
 # CONFIG_MFD_ARIZONA is not set
@@ -2673,6 +2671,7 @@ CONFIG_MFD_RTSX_USB=m
 CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SM501=m
 # CONFIG_MFD_STMPE is not set
+CONFIG_MFD_SUN4I_GPADC=m
 # CONFIG_MFD_SYSCON is not set
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6393XB is not set
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index 0502156e7..8d93e0edb 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -178,7 +178,6 @@ CONFIG_APM_POWER=m
 # CONFIG_APPLICOM is not set
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AR5523=m
-CONFIG_ARC_EMAC=m
 # CONFIG_ARCH_TEGRA_186_SOC is not set
 # CONFIG_ARCNET is not set
 # CONFIG_ARM64_PTDUMP is not set
@@ -2599,7 +2598,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_AAT2870_CORE is not set
-# CONFIG_MFD_AC100 is not set
 # CONFIG_MFD_ACT8945A is not set
 # CONFIG_MFD_ARIZONA_I2C is not set
 # CONFIG_MFD_ARIZONA is not set
@@ -2653,6 +2651,7 @@ CONFIG_MFD_RTSX_USB=m
 CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SM501=m
 # CONFIG_MFD_STMPE is not set
+CONFIG_MFD_SUN4I_GPADC=m
 # CONFIG_MFD_SYSCON is not set
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6393XB is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 6ca17b952..a967df94e 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -180,7 +180,6 @@ CONFIG_APPLDATA_OS=m
 # CONFIG_APPLICOM is not set
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AR5523=m
-CONFIG_ARC_EMAC=m
 # CONFIG_ARCH_TEGRA_186_SOC is not set
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_PTDUMP=y
@@ -2554,7 +2553,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
-# CONFIG_MFD_AC100 is not set
 # CONFIG_MFD_ACT8945A is not set
 # CONFIG_MFD_ARIZONA_I2C is not set
 # CONFIG_MFD_ARIZONA is not set
@@ -2608,6 +2606,7 @@ CONFIG_MFD_RTSX_USB=m
 CONFIG_MFD_SM501_GPIO=y
 # CONFIG_MFD_SM501 is not set
 # CONFIG_MFD_STMPE is not set
+CONFIG_MFD_SUN4I_GPADC=m
 # CONFIG_MFD_SYSCON is not set
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6393XB is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 556cdfd17..8eb7a2322 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -180,7 +180,6 @@ CONFIG_APPLDATA_OS=m
 # CONFIG_APPLICOM is not set
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AR5523=m
-CONFIG_ARC_EMAC=m
 # CONFIG_ARCH_TEGRA_186_SOC is not set
 # CONFIG_ARCNET is not set
 # CONFIG_ARM64_PTDUMP is not set
@@ -2534,7 +2533,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
-# CONFIG_MFD_AC100 is not set
 # CONFIG_MFD_ACT8945A is not set
 # CONFIG_MFD_ARIZONA_I2C is not set
 # CONFIG_MFD_ARIZONA is not set
@@ -2588,6 +2586,7 @@ CONFIG_MFD_RTSX_USB=m
 CONFIG_MFD_SM501_GPIO=y
 # CONFIG_MFD_SM501 is not set
 # CONFIG_MFD_STMPE is not set
+CONFIG_MFD_SUN4I_GPADC=m
 # CONFIG_MFD_SYSCON is not set
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6393XB is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 088a4ea25..86ff69a58 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -220,7 +220,6 @@ CONFIG_APPLE_PROPERTIES=y
 # CONFIG_APPLICOM is not set
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AR5523=m
-CONFIG_ARC_EMAC=m
 # CONFIG_ARCH_MEMORY_PROBE is not set
 # CONFIG_ARCH_TEGRA_186_SOC is not set
 # CONFIG_ARCNET is not set
@@ -2812,7 +2811,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_AAT2870_CORE is not set
-# CONFIG_MFD_AC100 is not set
 # CONFIG_MFD_ACT8945A is not set
 # CONFIG_MFD_ARIZONA_I2C is not set
 # CONFIG_MFD_ARIZONA is not set
@@ -2877,6 +2875,7 @@ CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SM501=m
 # CONFIG_MFD_SMSC is not set
 # CONFIG_MFD_STMPE is not set
+CONFIG_MFD_SUN4I_GPADC=m
 # CONFIG_MFD_SYSCON is not set
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6393XB is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 930f7233a..a2943df48 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -220,7 +220,6 @@ CONFIG_APPLE_PROPERTIES=y
 # CONFIG_APPLICOM is not set
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AR5523=m
-CONFIG_ARC_EMAC=m
 # CONFIG_ARCH_MEMORY_PROBE is not set
 # CONFIG_ARCH_TEGRA_186_SOC is not set
 # CONFIG_ARCNET is not set
@@ -2793,7 +2792,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_AAT2870_CORE is not set
-# CONFIG_MFD_AC100 is not set
 # CONFIG_MFD_ACT8945A is not set
 # CONFIG_MFD_ARIZONA_I2C is not set
 # CONFIG_MFD_ARIZONA is not set
@@ -2858,6 +2856,7 @@ CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SM501=m
 # CONFIG_MFD_SMSC is not set
 # CONFIG_MFD_STMPE is not set
+CONFIG_MFD_SUN4I_GPADC=m
 # CONFIG_MFD_SYSCON is not set
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6393XB is not set
diff --git a/kernel.spec b/kernel.spec
index 75aff135c..d0dacad48 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 0
 # The git snapshot level
-%define gitrev 5
+%define gitrev 6
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -2152,6 +2152,13 @@ fi
 #
 #
 %changelog
+* Tue Dec 20 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc0.git6.1
+- Linux v4.9-11815-ge93b1cc
+
+* Tue Dec 20 2016 Peter Robinson <pbrobinson@fedoraproject.org>
+- Minor ARM config updates
+- Enable some Qualcomm QDF2432 server platform options
+
 * Mon Dec 19 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc0.git5.1
 - Linux v4.9-11744-gb0b3a37
 
diff --git a/sources b/sources
index e5b2a93df..03a10e326 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (linux-4.9.tar.xz) = bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
 SHA512 (perf-man-4.9.tar.gz) = d23bb3da1eadd6623fddbf4696948de7675f3dcf57c711a7427dd7ae111394f58d8f42752938bbea7cd219f1e7f6f116fc67a1c74f769711063940a065f37b99
-SHA512 (patch-4.9-git5.xz) = df2403e8cbd74f9028405313f73fdcc49d230d982aac909efab1e75cb5d04cd3ac47e1277e8dc89b4e25f4141a4371e04ce5ab0ddfd6cd6fb7ffd508bcba611a
+SHA512 (patch-4.9-git6.xz) = 95529ed29fb45189278ee8baf8acbd43835f5e90d4e2f97188229641a95723da0d7c08e2b51dbe3633d5f6829dfee42f821871b7309c1111b09bb743fa4d7353