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/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 383aa62d1..fe38d780b 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -2874,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 diff --git a/kernel-aarch64.config b/kernel-aarch64.config index a23e9ae1e..eaf27dd5a 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -2854,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 diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 32646216f..f9b3af4ff 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -3121,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 diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 5b374f7a0..c78ec2d83 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -2994,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 diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index ddd53a4de..106a7a35d 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -2975,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 diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index eeb799bc5..2bc07b94d 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -3102,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 diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index c61dde0e2..838de57ec 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -2826,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 fb78dbac2..a34d80a35 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -2845,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 9bfc9c2dd..60c9bab1a 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -2845,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 5e3cd3866..77c8cb868 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -2826,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 8a94e7060..22fad5ed1 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -2726,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 ba906d67a..eab8de1bd 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -2706,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 ce59862c6..1db893489 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -2672,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 61df6f519..da5be09e8 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -2652,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 f49f81348..7e51b08bf 100644 --- a/kernel-ppc64p7-debug.config +++ b/kernel-ppc64p7-debug.config @@ -2671,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 ae18861cd..8d93e0edb 100644 --- a/kernel-ppc64p7.config +++ b/kernel-ppc64p7.config @@ -2651,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 984291267..a967df94e 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -2606,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 5505367a9..8eb7a2322 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -2586,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 419fdb28a..86ff69a58 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -2875,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 49fe37254..a2943df48 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -2856,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 dff055500..dd8bf9795 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,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 @@ -2132,6 +2132,9 @@ fi # # %changelog +* Tue Dec 20 2016 Justin M. Forbes - 4.10.0-0.rc0.git6.1 +- Linux v4.9-11815-ge93b1cc + * Tue Dec 20 2016 Peter Robinson - Minor ARM config updates - Enable some Qualcomm QDF2432 server platform options 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