Merge remote-tracking branch 'origin/master'kernel-4.12.0-0.rc7.git1.1.vanilla.knurd.1.fc26kernel-4.12.0-0.rc7.git1.1.vanilla.knurd.1.fc25

36 files changed, 13 insertions, 65 deletions

diff --git a/baseconfig/CONFIG_PINCTRL_TI_IODELAY b/baseconfig/CONFIG_PINCTRL_TI_IODELAY
deleted file mode 100644
index cc5eb6a6c..000000000
--- a/baseconfig/CONFIG_PINCTRL_TI_IODELAY
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PINCTRL_TI_IODELAY is not set
diff --git a/baseconfig/arm/CONFIG_SUN50I_A64_CCU b/baseconfig/arm/CONFIG_SUN50I_A64_CCU
deleted file mode 100644
index 9ce6c792a..000000000
--- a/baseconfig/arm/CONFIG_SUN50I_A64_CCU
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SUN50I_A64_CCU is not set
diff --git a/baseconfig/arm/CONFIG_SUN5I_CCU b/baseconfig/arm/CONFIG_SUN5I_CCU
deleted file mode 100644
index 26856d6b2..000000000
--- a/baseconfig/arm/CONFIG_SUN5I_CCU
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SUN5I_CCU is not set
diff --git a/baseconfig/arm/CONFIG_SUN6I_A31_CCU b/baseconfig/arm/CONFIG_SUN6I_A31_CCU
deleted file mode 100644
index 5ce1bb3f7..000000000
--- a/baseconfig/arm/CONFIG_SUN6I_A31_CCU
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SUN6I_A31_CCU is not set
diff --git a/baseconfig/arm/CONFIG_SUN8I_A23_CCU b/baseconfig/arm/CONFIG_SUN8I_A23_CCU
deleted file mode 100644
index 26ae1100c..000000000
--- a/baseconfig/arm/CONFIG_SUN8I_A23_CCU
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SUN8I_A23_CCU is not set
diff --git a/baseconfig/arm/CONFIG_SUN8I_A33_CCU b/baseconfig/arm/CONFIG_SUN8I_A33_CCU
deleted file mode 100644
index e1a357ee8..000000000
--- a/baseconfig/arm/CONFIG_SUN8I_A33_CCU
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SUN8I_A33_CCU is not set
diff --git a/baseconfig/arm/CONFIG_SUN8I_H3_CCU b/baseconfig/arm/CONFIG_SUN8I_H3_CCU
index 02cfb2c97..542d6fc7d 100644
--- a/baseconfig/arm/CONFIG_SUN8I_H3_CCU
+++ b/baseconfig/arm/CONFIG_SUN8I_H3_CCU
@@ -1 +1 @@
-# CONFIG_SUN8I_H3_CCU is not set
+CONFIG_SUN8I_H3_CCU=y
diff --git a/baseconfig/arm/CONFIG_SUN9I_A80_CCU b/baseconfig/arm/CONFIG_SUN9I_A80_CCU
deleted file mode 100644
index 82686b27e..000000000
--- a/baseconfig/arm/CONFIG_SUN9I_A80_CCU
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SUN9I_A80_CCU is not set
diff --git a/baseconfig/arm/CONFIG_SUNXI_CCU b/baseconfig/arm/CONFIG_SUNXI_CCU
deleted file mode 100644
index a383113ef..000000000
--- a/baseconfig/arm/CONFIG_SUNXI_CCU
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SUNXI_CCU is not set
diff --git a/baseconfig/arm/arm64/CONFIG_SUN8I_H3_CCU b/baseconfig/arm/arm64/CONFIG_SUN8I_H3_CCU
deleted file mode 100644
index 02cfb2c97..000000000
--- a/baseconfig/arm/arm64/CONFIG_SUN8I_H3_CCU
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SUN8I_H3_CCU is not set
diff --git a/baseconfig/arm/armv7/CONFIG_SUN8I_H3_CCU b/baseconfig/arm/armv7/CONFIG_SUN8I_H3_CCU
deleted file mode 100644
index 542d6fc7d..000000000
--- a/baseconfig/arm/armv7/CONFIG_SUN8I_H3_CCU
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SUN8I_H3_CCU=y
diff --git a/baseconfig/CONFIG_EXTCON_INTEL_INT3496 b/baseconfig/x86/CONFIG_EXTCON_INTEL_INT3496
index 3f6c5d6f5..3f6c5d6f5 100644
--- a/baseconfig/CONFIG_EXTCON_INTEL_INT3496
+++ b/baseconfig/x86/CONFIG_EXTCON_INTEL_INT3496
diff --git a/baseconfig/x86/x86_64/CONFIG_EXTCON_INTEL_INT3496 b/baseconfig/x86/x86_64/CONFIG_EXTCON_INTEL_INT3496
deleted file mode 100644
index 3f6c5d6f5..000000000
--- a/baseconfig/x86/x86_64/CONFIG_EXTCON_INTEL_INT3496
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EXTCON_INTEL_INT3496=m
diff --git a/gitrev b/gitrev
index e7cf84f8e..b4465c4d5 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-a38371cba67539ce6a5d5324db34bc2ddaf66cc1
+3c2bfbaadff6e0c257bb6b16c9c97f43618b13dc
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 998d239fe..bb2455093 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1487,7 +1487,6 @@ CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXTCON_ADC_JACK=m
 CONFIG_EXTCON_AXP288=m
 CONFIG_EXTCON_GPIO=m
-CONFIG_EXTCON_INTEL_INT3496=m
 CONFIG_EXTCON=m
 # CONFIG_EXTCON_MAX3355 is not set
 # CONFIG_EXTCON_QCOM_SPMI_MISC is not set
@@ -4016,7 +4015,6 @@ CONFIG_PINCTRL_QDF2XXX=y
 CONFIG_PINCTRL_SINGLE=y
 # CONFIG_PINCTRL_SUNRISEPOINT is not set
 # CONFIG_PINCTRL_SX150X is not set
-# CONFIG_PINCTRL_TI_IODELAY is not set
 CONFIG_PINCTRL=y
 CONFIG_PINMUX=y
 CONFIG_PKCS7_MESSAGE_PARSER=y
@@ -5366,14 +5364,9 @@ CONFIG_STUB_CLK_HI6220=y
 # CONFIG_SUN4I_EMAC is not set
 CONFIG_SUN4I_GPADC=m
 CONFIG_SUN50I_A64_CCU=y
-# CONFIG_SUN5I_CCU is not set
-# CONFIG_SUN6I_A31_CCU is not set
-# CONFIG_SUN8I_A23_CCU is not set
-# CONFIG_SUN8I_A33_CCU is not set
-# CONFIG_SUN8I_H3_CCU is not set
+CONFIG_SUN8I_H3_CCU=y
 CONFIG_SUN8I_R_CCU=y
 # CONFIG_SUN8I_V3S_CCU is not set
-# CONFIG_SUN9I_A80_CCU is not set
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
 CONFIG_SUNGEM=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 11dab5c5d..e09397467 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1477,7 +1477,6 @@ CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXTCON_ADC_JACK=m
 CONFIG_EXTCON_AXP288=m
 CONFIG_EXTCON_GPIO=m
-CONFIG_EXTCON_INTEL_INT3496=m
 CONFIG_EXTCON=m
 # CONFIG_EXTCON_MAX3355 is not set
 # CONFIG_EXTCON_QCOM_SPMI_MISC is not set
@@ -3995,7 +3994,6 @@ CONFIG_PINCTRL_QDF2XXX=y
 CONFIG_PINCTRL_SINGLE=y
 # CONFIG_PINCTRL_SUNRISEPOINT is not set
 # CONFIG_PINCTRL_SX150X is not set
-# CONFIG_PINCTRL_TI_IODELAY is not set
 CONFIG_PINCTRL=y
 CONFIG_PINMUX=y
 CONFIG_PKCS7_MESSAGE_PARSER=y
@@ -5343,14 +5341,9 @@ CONFIG_STUB_CLK_HI6220=y
 # CONFIG_SUN4I_EMAC is not set
 CONFIG_SUN4I_GPADC=m
 CONFIG_SUN50I_A64_CCU=y
-# CONFIG_SUN5I_CCU is not set
-# CONFIG_SUN6I_A31_CCU is not set
-# CONFIG_SUN8I_A23_CCU is not set
-# CONFIG_SUN8I_A33_CCU is not set
-# CONFIG_SUN8I_H3_CCU is not set
+CONFIG_SUN8I_H3_CCU=y
 CONFIG_SUN8I_R_CCU=y
 # CONFIG_SUN8I_V3S_CCU is not set
-# CONFIG_SUN9I_A80_CCU is not set
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
 CONFIG_SUNGEM=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index dc29d9014..48940dddf 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1600,7 +1600,6 @@ CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXTCON_ADC_JACK=m
 CONFIG_EXTCON_AXP288=m
 CONFIG_EXTCON_GPIO=m
-CONFIG_EXTCON_INTEL_INT3496=m
 # CONFIG_EXTCON_MAX3355 is not set
 CONFIG_EXTCON_MAX8997=m
 CONFIG_EXTCON_PALMAS=m
@@ -4322,7 +4321,6 @@ CONFIG_PINCTRL_SAMSUNG=y
 CONFIG_PINCTRL_SINGLE=y
 # CONFIG_PINCTRL_SUNRISEPOINT is not set
 # CONFIG_PINCTRL_SX150X is not set
-# CONFIG_PINCTRL_TI_IODELAY is not set
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_ZYNQ=y
 CONFIG_PINMUX=y
@@ -5858,7 +5856,6 @@ CONFIG_ST_THERMAL_MEMMAP=m
 # CONFIG_ST_THERMAL_SYSCFG is not set
 CONFIG_SUN4I_EMAC=m
 CONFIG_SUN4I_GPADC=m
-# CONFIG_SUN50I_A64_CCU is not set
 CONFIG_SUN5I_CCU=y
 CONFIG_SUN6I_A31_CCU=y
 CONFIG_SUN8I_A23_CCU=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index e8a5feb8b..5b179f2f9 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1514,7 +1514,6 @@ CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXTCON_ADC_JACK=m
 CONFIG_EXTCON_AXP288=m
 CONFIG_EXTCON_GPIO=m
-CONFIG_EXTCON_INTEL_INT3496=m
 # CONFIG_EXTCON_MAX3355 is not set
 CONFIG_EXTCON_MAX8997=m
 # CONFIG_EXTCON_QCOM_SPMI_MISC is not set
@@ -4088,7 +4087,6 @@ CONFIG_PINCTRL_SAMSUNG=y
 CONFIG_PINCTRL_SINGLE=y
 # CONFIG_PINCTRL_SUNRISEPOINT is not set
 # CONFIG_PINCTRL_SX150X is not set
-# CONFIG_PINCTRL_TI_IODELAY is not set
 CONFIG_PINCTRL=y
 CONFIG_PINMUX=y
 CONFIG_PJ4B_ERRATA_4742=y
@@ -5463,7 +5461,6 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_STRIP is not set
 CONFIG_SUN4I_EMAC=m
 CONFIG_SUN4I_GPADC=m
-# CONFIG_SUN50I_A64_CCU is not set
 CONFIG_SUN5I_CCU=y
 CONFIG_SUN6I_A31_CCU=y
 CONFIG_SUN8I_A23_CCU=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 4119ecd40..429783fa3 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1504,7 +1504,6 @@ CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXTCON_ADC_JACK=m
 CONFIG_EXTCON_AXP288=m
 CONFIG_EXTCON_GPIO=m
-CONFIG_EXTCON_INTEL_INT3496=m
 # CONFIG_EXTCON_MAX3355 is not set
 CONFIG_EXTCON_MAX8997=m
 # CONFIG_EXTCON_QCOM_SPMI_MISC is not set
@@ -4067,7 +4066,6 @@ CONFIG_PINCTRL_SAMSUNG=y
 CONFIG_PINCTRL_SINGLE=y
 # CONFIG_PINCTRL_SUNRISEPOINT is not set
 # CONFIG_PINCTRL_SX150X is not set
-# CONFIG_PINCTRL_TI_IODELAY is not set
 CONFIG_PINCTRL=y
 CONFIG_PINMUX=y
 CONFIG_PJ4B_ERRATA_4742=y
@@ -5440,7 +5438,6 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_STRIP is not set
 CONFIG_SUN4I_EMAC=m
 CONFIG_SUN4I_GPADC=m
-# CONFIG_SUN50I_A64_CCU is not set
 CONFIG_SUN5I_CCU=y
 CONFIG_SUN6I_A31_CCU=y
 CONFIG_SUN8I_A23_CCU=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index c3dc22050..0e8030d81 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1590,7 +1590,6 @@ CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXTCON_ADC_JACK=m
 CONFIG_EXTCON_AXP288=m
 CONFIG_EXTCON_GPIO=m
-CONFIG_EXTCON_INTEL_INT3496=m
 # CONFIG_EXTCON_MAX3355 is not set
 CONFIG_EXTCON_MAX8997=m
 CONFIG_EXTCON_PALMAS=m
@@ -4301,7 +4300,6 @@ CONFIG_PINCTRL_SAMSUNG=y
 CONFIG_PINCTRL_SINGLE=y
 # CONFIG_PINCTRL_SUNRISEPOINT is not set
 # CONFIG_PINCTRL_SX150X is not set
-# CONFIG_PINCTRL_TI_IODELAY is not set
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_ZYNQ=y
 CONFIG_PINMUX=y
@@ -5835,7 +5833,6 @@ CONFIG_ST_THERMAL_MEMMAP=m
 # CONFIG_ST_THERMAL_SYSCFG is not set
 CONFIG_SUN4I_EMAC=m
 CONFIG_SUN4I_GPADC=m
-# CONFIG_SUN50I_A64_CCU is not set
 CONFIG_SUN5I_CCU=y
 CONFIG_SUN6I_A31_CCU=y
 CONFIG_SUN8I_A23_CCU=y
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index fa49266c6..8c9191d7e 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -3849,7 +3849,6 @@ CONFIG_PINCTRL_CHERRYVIEW=y
 # CONFIG_PINCTRL_SINGLE is not set
 CONFIG_PINCTRL_SUNRISEPOINT=m
 # CONFIG_PINCTRL_SX150X is not set
-# CONFIG_PINCTRL_TI_IODELAY is not set
 CONFIG_PINCTRL=y
 CONFIG_PINMUX=y
 CONFIG_PKCS7_MESSAGE_PARSER=y
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 2f7b0c57e..28cca58e5 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -3869,7 +3869,6 @@ CONFIG_PINCTRL_CHERRYVIEW=y
 # CONFIG_PINCTRL_SINGLE is not set
 CONFIG_PINCTRL_SUNRISEPOINT=m
 # CONFIG_PINCTRL_SX150X is not set
-# CONFIG_PINCTRL_TI_IODELAY is not set
 CONFIG_PINCTRL=y
 CONFIG_PINMUX=y
 CONFIG_PKCS7_MESSAGE_PARSER=y
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index e937d8035..bd214d7e1 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -3869,7 +3869,6 @@ CONFIG_PINCTRL_CHERRYVIEW=y
 # CONFIG_PINCTRL_SINGLE is not set
 CONFIG_PINCTRL_SUNRISEPOINT=m
 # CONFIG_PINCTRL_SX150X is not set
-# CONFIG_PINCTRL_TI_IODELAY is not set
 CONFIG_PINCTRL=y
 CONFIG_PINMUX=y
 CONFIG_PKCS7_MESSAGE_PARSER=y
diff --git a/kernel-i686.config b/kernel-i686.config
index ededfcd78..d6501ebcf 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -3849,7 +3849,6 @@ CONFIG_PINCTRL_CHERRYVIEW=y
 # CONFIG_PINCTRL_SINGLE is not set
 CONFIG_PINCTRL_SUNRISEPOINT=m
 # CONFIG_PINCTRL_SX150X is not set
-# CONFIG_PINCTRL_TI_IODELAY is not set
 CONFIG_PINCTRL=y
 CONFIG_PINMUX=y
 CONFIG_PKCS7_MESSAGE_PARSER=y
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 783d4877a..3f43bfeda 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -1285,7 +1285,6 @@ CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_USE_FOR_EXT2=y
 # CONFIG_EXTCON_ADC_JACK is not set
-CONFIG_EXTCON_INTEL_INT3496=m
 # CONFIG_EXTCON is not set
 # CONFIG_EXTCON_QCOM_SPMI_MISC is not set
 CONFIG_EXTRA_FIRMWARE=""
@@ -3663,7 +3662,6 @@ CONFIG_PID_NS=y
 # CONFIG_PINCTRL is not set
 # CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_SX150X is not set
-# CONFIG_PINCTRL_TI_IODELAY is not set
 # CONFIG_PINMUX is not set
 CONFIG_PKCS7_MESSAGE_PARSER=y
 # CONFIG_PKCS7_TEST_KEY is not set
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 5a433cfee..c391bcd62 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -1274,7 +1274,6 @@ CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_USE_FOR_EXT2=y
 # CONFIG_EXTCON_ADC_JACK is not set
-CONFIG_EXTCON_INTEL_INT3496=m
 # CONFIG_EXTCON is not set
 # CONFIG_EXTCON_QCOM_SPMI_MISC is not set
 CONFIG_EXTRA_FIRMWARE=""
@@ -3641,7 +3640,6 @@ CONFIG_PID_NS=y
 # CONFIG_PINCTRL is not set
 # CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_SX150X is not set
-# CONFIG_PINCTRL_TI_IODELAY is not set
 # CONFIG_PINMUX is not set
 CONFIG_PKCS7_MESSAGE_PARSER=y
 # CONFIG_PKCS7_TEST_KEY is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 27e381b45..b187162f4 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -1239,7 +1239,6 @@ CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_USE_FOR_EXT2=y
 # CONFIG_EXTCON_ADC_JACK is not set
-CONFIG_EXTCON_INTEL_INT3496=m
 # CONFIG_EXTCON is not set
 # CONFIG_EXTCON_QCOM_SPMI_MISC is not set
 CONFIG_EXTRA_FIRMWARE=""
@@ -3606,7 +3605,6 @@ CONFIG_PID_NS=y
 # CONFIG_PINCTRL is not set
 # CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_SX150X is not set
-# CONFIG_PINCTRL_TI_IODELAY is not set
 # CONFIG_PINMUX is not set
 CONFIG_PKCS7_MESSAGE_PARSER=y
 # CONFIG_PKCS7_TEST_KEY is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 4c8de78e8..a4e6bca7a 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -1228,7 +1228,6 @@ CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_USE_FOR_EXT2=y
 # CONFIG_EXTCON_ADC_JACK is not set
-CONFIG_EXTCON_INTEL_INT3496=m
 # CONFIG_EXTCON is not set
 # CONFIG_EXTCON_QCOM_SPMI_MISC is not set
 CONFIG_EXTRA_FIRMWARE=""
@@ -3584,7 +3583,6 @@ CONFIG_PID_NS=y
 # CONFIG_PINCTRL is not set
 # CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_SX150X is not set
-# CONFIG_PINCTRL_TI_IODELAY is not set
 # CONFIG_PINMUX is not set
 CONFIG_PKCS7_MESSAGE_PARSER=y
 # CONFIG_PKCS7_TEST_KEY is not set
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index dfda11eee..f441afb10 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -1238,7 +1238,6 @@ CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_USE_FOR_EXT2=y
 # CONFIG_EXTCON_ADC_JACK is not set
-CONFIG_EXTCON_INTEL_INT3496=m
 # CONFIG_EXTCON is not set
 # CONFIG_EXTCON_QCOM_SPMI_MISC is not set
 CONFIG_EXTRA_FIRMWARE=""
@@ -3605,7 +3604,6 @@ CONFIG_PID_NS=y
 # CONFIG_PINCTRL is not set
 # CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_SX150X is not set
-# CONFIG_PINCTRL_TI_IODELAY is not set
 # CONFIG_PINMUX is not set
 CONFIG_PKCS7_MESSAGE_PARSER=y
 # CONFIG_PKCS7_TEST_KEY is not set
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index f374e959b..2b8f16745 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -1227,7 +1227,6 @@ CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_USE_FOR_EXT2=y
 # CONFIG_EXTCON_ADC_JACK is not set
-CONFIG_EXTCON_INTEL_INT3496=m
 # CONFIG_EXTCON is not set
 # CONFIG_EXTCON_QCOM_SPMI_MISC is not set
 CONFIG_EXTRA_FIRMWARE=""
@@ -3583,7 +3582,6 @@ CONFIG_PID_NS=y
 # CONFIG_PINCTRL is not set
 # CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_SX150X is not set
-# CONFIG_PINCTRL_TI_IODELAY is not set
 # CONFIG_PINMUX is not set
 CONFIG_PKCS7_MESSAGE_PARSER=y
 # CONFIG_PKCS7_TEST_KEY is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 0901700cb..8aa42f5f0 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1231,7 +1231,6 @@ CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_USE_FOR_EXT2=y
 # CONFIG_EXTCON_ADC_JACK is not set
-CONFIG_EXTCON_INTEL_INT3496=m
 # CONFIG_EXTCON is not set
 # CONFIG_EXTCON_QCOM_SPMI_MISC is not set
 CONFIG_EXTRA_FIRMWARE=""
@@ -3534,7 +3533,6 @@ CONFIG_PID_NS=y
 # CONFIG_PINCTRL is not set
 # CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_SX150X is not set
-# CONFIG_PINCTRL_TI_IODELAY is not set
 # CONFIG_PINMUX is not set
 CONFIG_PKCS7_MESSAGE_PARSER=y
 # CONFIG_PKCS7_TEST_KEY is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index b9c1f6c30..263b2798e 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1220,7 +1220,6 @@ CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_USE_FOR_EXT2=y
 # CONFIG_EXTCON_ADC_JACK is not set
-CONFIG_EXTCON_INTEL_INT3496=m
 # CONFIG_EXTCON is not set
 # CONFIG_EXTCON_QCOM_SPMI_MISC is not set
 CONFIG_EXTRA_FIRMWARE=""
@@ -3512,7 +3511,6 @@ CONFIG_PID_NS=y
 # CONFIG_PINCTRL is not set
 # CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_SX150X is not set
-# CONFIG_PINCTRL_TI_IODELAY is not set
 # CONFIG_PINMUX is not set
 CONFIG_PKCS7_MESSAGE_PARSER=y
 # CONFIG_PKCS7_TEST_KEY is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index b74513e94..c7cbf8ff2 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -3908,7 +3908,6 @@ CONFIG_PINCTRL_CHERRYVIEW=y
 # CONFIG_PINCTRL_MSM8994 is not set
 CONFIG_PINCTRL_SUNRISEPOINT=m
 # CONFIG_PINCTRL_SX150X is not set
-# CONFIG_PINCTRL_TI_IODELAY is not set
 CONFIG_PINCTRL=y
 CONFIG_PINMUX=y
 CONFIG_PKCS7_MESSAGE_PARSER=y
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 75f938ea5..fa8f3f7d0 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -3888,7 +3888,6 @@ CONFIG_PINCTRL_CHERRYVIEW=y
 # CONFIG_PINCTRL_MSM8994 is not set
 CONFIG_PINCTRL_SUNRISEPOINT=m
 # CONFIG_PINCTRL_SX150X is not set
-# CONFIG_PINCTRL_TI_IODELAY is not set
 CONFIG_PINCTRL=y
 CONFIG_PINMUX=y
 CONFIG_PKCS7_MESSAGE_PARSER=y
diff --git a/kernel.spec b/kernel.spec
index fc11ae134..2297e4287 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 7
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -133,7 +133,7 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
 
 # Want to build a vanilla kernel build without any non-upstream patches?
 %define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1}
@@ -2213,6 +2213,12 @@ fi
 #
 #
 %changelog
+* Tue Jun 27 2017 Laura Abbott <labbott@fedoraproject.org> - 4.12.0-0.rc7.git1.1
+- Linux v4.12-rc7-8-g3c2bfba
+
+* Tue Jun 27 2017 Laura Abbott <labbott@fedoraproject.org>
+- Reenable debugging options.
+
 * Mon Jun 26 2017 Peter Robinson <pbrobinson@fedoraproject.org>
 - Config improvements for Qualcomm devices
 
diff --git a/sources b/sources
index 709ae54f4..119d84d3e 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 SHA512 (perf-man-4.11.tar.gz) = f6dec8c3a296fc5bb1dd58011d7d1340550b9f4f228169bab079b0b36f2d5d96784b808765acda2d547719f6e9fd73b2855ab825dfe4fea8af43c55e5786f8d6
 SHA512 (linux-4.11.tar.xz) = 6610eed97ffb7207c71771198c36179b8244ace7222bebb109507720e26c5f17d918079a56d5febdd8605844d67fb2df0ebe910fa2f2f53690daf6e2a8ad09c3
 SHA512 (patch-4.12-rc7.xz) = 0e2edc68851374111c458fb0557c724ec1db0376ea42b40177205453961791cc717cede122da95408b3e2eb5d59a7a7b214d70aed1cbb271d572a78e39c5b244
+SHA512 (patch-4.12-rc7-git1.xz) = 9b9b06a6ddb7f3804c2a9b36c78855aed67c95af4e2abf680782761afc78a1cb0e1cf4cd49b3409fe808899c30649632fc2394e3422ddf559ea6bb4a36b9eb58