Linux v4.12-rc2

20 files changed, 10 insertions, 309 deletions

diff --git a/ARM-KVM-Fix-tracepoint-generation-after-move-to-virt-kvm-arm.patch b/ARM-KVM-Fix-tracepoint-generation-after-move-to-virt-kvm-arm.patch
deleted file mode 100644
index af2a3dfc2..000000000
--- a/ARM-KVM-Fix-tracepoint-generation-after-move-to-virt-kvm-arm.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From patchwork Fri May 12 10:04:52 2017
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: ARM: KVM: Fix tracepoint generation after move to virt/kvm/arm/
-From: Marc Zyngier <Marc.Zyngier@arm.com>
-X-Patchwork-Id: 9723825
-Message-Id: <20170512100452.8245-1-marc.zyngier@arm.com>
-To: Christoffer Dall <christoffer.dall@linaro.org>
-Cc: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu,
- linux-arm-kernel@lists.infradead.org, arnd@arndb.de
-Date: Fri, 12 May 2017 11:04:52 +0100
-
-Moving most of the shared code to virt/kvm/arm had for consequence
-that KVM/ARM doesn't build anymore, because the code that used to
-define the tracepoints is now somewhere else.
-
-Fix this by defining CREATE_TRACE_POINTS in coproc.c, and clean-up
-trace.h as well.
-
-Fixes: 35d2d5d490e2 ("KVM: arm/arm64: Move shared files to virt/kvm/arm")
-Reported-by: Arnd Bergmann <arnd@arndb.de>
-Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
----
- arch/arm/kvm/coproc.c | 1 +
- arch/arm/kvm/trace.h  | 8 ++++----
- 2 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/arch/arm/kvm/coproc.c b/arch/arm/kvm/coproc.c
-index 2c14b69511e9..ac8d36da4d08 100644
---- a/arch/arm/kvm/coproc.c
-+++ b/arch/arm/kvm/coproc.c
-@@ -32,6 +32,7 @@
- #include <asm/vfp.h>
- #include "../vfp/vfpinstr.h"
- 
-+#define CREATE_TRACE_POINTS
- #include "trace.h"
- #include "coproc.h"
- 
-diff --git a/arch/arm/kvm/trace.h b/arch/arm/kvm/trace.h
-index fc0943776db2..b0d10648c486 100644
---- a/arch/arm/kvm/trace.h
-+++ b/arch/arm/kvm/trace.h
-@@ -1,5 +1,5 @@
--#if !defined(_TRACE_KVM_H) || defined(TRACE_HEADER_MULTI_READ)
--#define _TRACE_KVM_H
-+#if !defined(_TRACE_ARM_KVM_H) || defined(TRACE_HEADER_MULTI_READ)
-+#define _TRACE_ARM_KVM_H
- 
- #include <linux/tracepoint.h>
- 
-@@ -74,10 +74,10 @@ TRACE_EVENT(kvm_hvc,
- 		  __entry->vcpu_pc, __entry->r0, __entry->imm)
- );
- 
--#endif /* _TRACE_KVM_H */
-+#endif /* _TRACE_ARM_KVM_H */
- 
- #undef TRACE_INCLUDE_PATH
--#define TRACE_INCLUDE_PATH arch/arm/kvm
-+#define TRACE_INCLUDE_PATH .
- #undef TRACE_INCLUDE_FILE
- #define TRACE_INCLUDE_FILE trace
- 
diff --git a/AllWinner-net-emac.patch b/AllWinner-net-emac.patch
index fbe66a19e..a26b3ae9e 100644
--- a/AllWinner-net-emac.patch
+++ b/AllWinner-net-emac.patch
@@ -2225,6 +2225,6 @@ index ce07285..4575fbb 100644
  CONFIG_SMSC911X=y
  CONFIG_STMMAC_ETH=m
 +CONFIG_DWMAC_SUN8I=m
- CONFIG_REALTEK_PHY=m
+ CONFIG_MDIO_BUS_MUX_MMIOREG=y
  CONFIG_MESON_GXL_PHY=m
  CONFIG_MICREL_PHY=y
diff --git a/bcm283x-fixes.patch b/bcm283x-fixes.patch
deleted file mode 100644
index fcddac501..000000000
--- a/bcm283x-fixes.patch
+++ /dev/null
@@ -1,218 +0,0 @@
-From patchwork Sun Jan 29 18:40:59 2017
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [v2] ARM: bcm2835: dts: fix uart0 pinctrl node names
-From: Baruch Siach <baruch@tkos.co.il>
-X-Patchwork-Id: 9544261
-Message-Id: <f37d02c769d0e2b6db2529cafb86b5fdd1e09a94.1485715259.git.baruch@tkos.co.il>
-To: Stephen Warren <swarren@wwwdotorg.org>, Lee Jones <lee@kernel.org>,
- Eric Anholt <eric@anholt.net>
-Cc: Baruch Siach <baruch@tkos.co.il>, linux-rpi-kernel@lists.infradead.org, 
- linux-arm-kernel@lists.infradead.org
-Date: Sun, 29 Jan 2017 20:40:59 +0200
-
-Downstream kernel uses pins 32, 33 as UART0 (PL011) Rx/Tx to communicate with
-the Bluetooth chip. So ALT3 of these pins is most likely not CTS/RTS. Change
-the node name to reflect that. This matches section 6.2 "Alternative Function
-Assignments" in the BCM2835 ARM Peripherals document.
-
-With this change in place, adding
-
-  &uart0 {
-	 pinctrl-names = "default";
-	 pinctrl-0 = <&uart0_gpio32 &gpclk2_gpio43>;
-	 status = "okay";
-  };
-
-to bcm2837-rpi-3-b.dts does the right thing on my Raspberry Pi 3.
-
-Pins 30, 31 are CTS/RTS of UART0 in alternate function 3. Rename uart0_gpio30
-as well.
-
-While at it, fix a little typo in a nearby comment.
-
-Fixes: 21ff843931b ("ARM: dts: bcm283x: Define standard pinctrl groups in the gpio node.")
-Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
-Reviewed-by: Eric Anholt <eric@anholt.net>
----
-v2:
-   * Reference the ARM Peripherals document
-   * Fix subject typo (Stefan)
-   * Rename also uart0_gpio30 (Stefan)
-   * Add comment typo fix (Stefan)
-   * Add Stefan's ack
----
- arch/arm/boot/dts/bcm283x.dtsi | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
-index 9a44da190897..bc8ad417c8a3 100644
---- a/arch/arm/boot/dts/bcm283x.dtsi
-+++ b/arch/arm/boot/dts/bcm283x.dtsi
-@@ -292,17 +292,17 @@
- 			/* Separate from the uart0_gpio14 group
- 			 * because it conflicts with spi1_gpio16, and
- 			 * people often run uart0 on the two pins
--			 * without flow contrl.
-+			 * without flow control.
- 			 */
- 			uart0_ctsrts_gpio16: uart0_ctsrts_gpio16 {
- 				brcm,pins = <16 17>;
- 				brcm,function = <BCM2835_FSEL_ALT3>;
- 			};
--			uart0_gpio30: uart0_gpio30 {
-+			uart0_ctsrts_gpio30: uart0_ctsrts_gpio30 {
- 				brcm,pins = <30 31>;
- 				brcm,function = <BCM2835_FSEL_ALT3>;
- 			};
--			uart0_ctsrts_gpio32: uart0_ctsrts_gpio32 {
-+			uart0_gpio32: uart0_gpio32 {
- 				brcm,pins = <32 33>;
- 				brcm,function = <BCM2835_FSEL_ALT3>;
- 			};
-From patchwork Sun Jan 29 19:53:10 2017
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [1/2] ARM: bcm2835: dts: fix i2c0 pins
-From: Baruch Siach <baruch@tkos.co.il>
-X-Patchwork-Id: 9544275
-Message-Id: <9290fa9eed6b5ff1c5c96b9dac41eca286b7eef9.1485719591.git.baruch@tkos.co.il>
-To: Stephen Warren <swarren@wwwdotorg.org>, Lee Jones <lee@kernel.org>,
- Eric Anholt <eric@anholt.net>
-Cc: Baruch Siach <baruch@tkos.co.il>, linux-rpi-kernel@lists.infradead.org, 
- linux-arm-kernel@lists.infradead.org
-Date: Sun, 29 Jan 2017 21:53:10 +0200
-
-According to the BCM2835 ARM Peripherals document i2c0 doesn't map to pins 32,
-34 but to 28, 29.
-
-Fixes: 21ff843931b ("ARM: dts: bcm283x: Define standard pinctrl groups in the gpio node.")
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
- arch/arm/boot/dts/bcm283x.dtsi | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
-index bc8ad417c8a3..2ae842921250 100644
---- a/arch/arm/boot/dts/bcm283x.dtsi
-+++ b/arch/arm/boot/dts/bcm283x.dtsi
-@@ -195,8 +195,8 @@
- 				brcm,pins = <0 1>;
- 				brcm,function = <BCM2835_FSEL_ALT0>;
- 			};
--			i2c0_gpio32: i2c0_gpio32 {
--				brcm,pins = <32 34>;
-+			i2c0_gpio28: i2c0_gpio28 {
-+				brcm,pins = <28 29>;
- 				brcm,function = <BCM2835_FSEL_ALT0>;
- 			};
- 			i2c0_gpio44: i2c0_gpio44 {
-From patchwork Sun Jan 29 19:53:11 2017
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [2/2] ARM: bcm2835: dts: fix uart0/uart1 pins
-From: Baruch Siach <baruch@tkos.co.il>
-X-Patchwork-Id: 9544277
-Message-Id: <e0f527a24b0048daba88ef36d5324245e003111c.1485719591.git.baruch@tkos.co.il>
-To: Stephen Warren <swarren@wwwdotorg.org>, Lee Jones <lee@kernel.org>,
- Eric Anholt <eric@anholt.net>
-Cc: Baruch Siach <baruch@tkos.co.il>, linux-rpi-kernel@lists.infradead.org, 
- linux-arm-kernel@lists.infradead.org
-Date: Sun, 29 Jan 2017 21:53:11 +0200
-
-According to the BCM2835 ARM Peripherals document uart1 doesn't map to pins
-36-39, but uart0 does.
-
-Also, split into separate Rx/Tx and CST/RTS groups to match other uart nodes.
-
-Fixes: 21ff843931b ("ARM: dts: bcm283x: Define standard pinctrl groups in the gpio node.")
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
- arch/arm/boot/dts/bcm283x.dtsi | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
-index 2ae842921250..9ee8346b8b19 100644
---- a/arch/arm/boot/dts/bcm283x.dtsi
-+++ b/arch/arm/boot/dts/bcm283x.dtsi
-@@ -306,6 +306,14 @@
- 				brcm,pins = <32 33>;
- 				brcm,function = <BCM2835_FSEL_ALT3>;
- 			};
-+			uart0_gpio36: uart0_gpio36 {
-+				brcm,pins = <36 37>;
-+				brcm,function = <BCM2835_FSEL_ALT2>;
-+			};
-+			uart0_ctsrts_gpio38: uart0_ctsrts_gpio38 {
-+				brcm,pins = <38 39>;
-+				brcm,function = <BCM2835_FSEL_ALT2>;
-+			};
- 
- 			uart1_gpio14: uart1_gpio14 {
- 				brcm,pins = <14 15>;
-@@ -323,10 +331,6 @@
- 				brcm,pins = <30 31>;
- 				brcm,function = <BCM2835_FSEL_ALT5>;
- 			};
--			uart1_gpio36: uart1_gpio36 {
--				brcm,pins = <36 37 38 39>;
--				brcm,function = <BCM2835_FSEL_ALT2>;
--			};
- 			uart1_gpio40: uart1_gpio40 {
- 				brcm,pins = <40 41>;
- 				brcm,function = <BCM2835_FSEL_ALT5>;
-From patchwork Mon Jan 30 18:44:39 2017
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: ARM: bcm2835: dt: add index to the ethernet alias
-From: Baruch Siach <baruch@tkos.co.il>
-X-Patchwork-Id: 9545945
-Message-Id: <5942321c5d0bfea54eac64ace2b217e8e0b6220d.1485801879.git.baruch@tkos.co.il>
-To: Stephen Warren <swarren@wwwdotorg.org>, Lee Jones <lee@kernel.org>,
- Eric Anholt <eric@anholt.net>
-Cc: Lubomir Rintel <lkundrak@v3.sk>, Baruch Siach <baruch@tkos.co.il>,
- linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org
-Date: Mon, 30 Jan 2017 20:44:39 +0200
-
-An alias name should have an index number even when it is the only of its type.
-This allows U-Boot to add the local-mac-address property. Otherwise U-Boot
-skips the alias.
-
-Cc: Lubomir Rintel <lkundrak@v3.sk>
-Fixes: 6a93792774 ("ARM: bcm2835: dt: Add the ethernet to the device trees")
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
-Acked-by: Lubomir Rintel <lkundrak@v3.sk>
----
- arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi | 2 +-
- arch/arm/boot/dts/bcm283x-rpi-smsc9514.dtsi | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi b/arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi
-index 12c981e51134..9a0599f711ff 100644
---- a/arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi
-+++ b/arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi
-@@ -1,6 +1,6 @@
- / {
- 	aliases {
--		ethernet = &ethernet;
-+		ethernet0 = &ethernet;
- 	};
- };
- 
-diff --git a/arch/arm/boot/dts/bcm283x-rpi-smsc9514.dtsi b/arch/arm/boot/dts/bcm283x-rpi-smsc9514.dtsi
-index 3f0a56ebcf1f..dc7ae776db5f 100644
---- a/arch/arm/boot/dts/bcm283x-rpi-smsc9514.dtsi
-+++ b/arch/arm/boot/dts/bcm283x-rpi-smsc9514.dtsi
-@@ -1,6 +1,6 @@
- / {
- 	aliases {
--		ethernet = &ethernet;
-+		ethernet0 = &ethernet;
- 	};
- };
- 
diff --git a/gitrev b/gitrev
index a6d972681..b13b3e7eb 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-8b4822de59d5d9919b9b045183a36c673ce20b73
+08332893e37af6ae779367e78e444f8f9571511d
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index ba738ab4d..294e6ff1d 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1481,7 +1481,6 @@ CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXTCON_ADC_JACK=m
 CONFIG_EXTCON_AXP288=m
 CONFIG_EXTCON_GPIO=m
-CONFIG_EXTCON_INTEL_CHT_WC=y
 CONFIG_EXTCON_INTEL_INT3496=m
 CONFIG_EXTCON=m
 # CONFIG_EXTCON_MAX3355 is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 2c1e86bbf..c1206bc4d 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1471,7 +1471,6 @@ CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXTCON_ADC_JACK=m
 CONFIG_EXTCON_AXP288=m
 CONFIG_EXTCON_GPIO=m
-CONFIG_EXTCON_INTEL_CHT_WC=y
 CONFIG_EXTCON_INTEL_INT3496=m
 CONFIG_EXTCON=m
 # CONFIG_EXTCON_MAX3355 is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 894a70201..c274c6453 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1597,7 +1597,6 @@ CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXTCON_ADC_JACK=m
 CONFIG_EXTCON_AXP288=m
 CONFIG_EXTCON_GPIO=m
-CONFIG_EXTCON_INTEL_CHT_WC=y
 CONFIG_EXTCON_INTEL_INT3496=m
 # CONFIG_EXTCON_MAX3355 is not set
 CONFIG_EXTCON_MAX8997=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 5f805dcbf..ba0aa5081 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1517,7 +1517,6 @@ CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXTCON_ADC_JACK=m
 CONFIG_EXTCON_AXP288=m
 CONFIG_EXTCON_GPIO=m
-CONFIG_EXTCON_INTEL_CHT_WC=y
 CONFIG_EXTCON_INTEL_INT3496=m
 # CONFIG_EXTCON_MAX3355 is not set
 CONFIG_EXTCON_MAX8997=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 690b59183..c9e98d0f1 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1507,7 +1507,6 @@ CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXTCON_ADC_JACK=m
 CONFIG_EXTCON_AXP288=m
 CONFIG_EXTCON_GPIO=m
-CONFIG_EXTCON_INTEL_CHT_WC=y
 CONFIG_EXTCON_INTEL_INT3496=m
 # CONFIG_EXTCON_MAX3355 is not set
 CONFIG_EXTCON_MAX8997=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index a03f83ff9..2f678cf56 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1587,7 +1587,6 @@ CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXTCON_ADC_JACK=m
 CONFIG_EXTCON_AXP288=m
 CONFIG_EXTCON_GPIO=m
-CONFIG_EXTCON_INTEL_CHT_WC=y
 CONFIG_EXTCON_INTEL_INT3496=m
 # CONFIG_EXTCON_MAX3355 is not set
 CONFIG_EXTCON_MAX8997=m
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 7ba3b3bd3..fb012469f 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -1287,7 +1287,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_CHT_WC=y
 CONFIG_EXTCON_INTEL_INT3496=m
 # CONFIG_EXTCON is not set
 # CONFIG_EXTCON_QCOM_SPMI_MISC is not set
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 8faf42811..750aec58a 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -1276,7 +1276,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_CHT_WC=y
 CONFIG_EXTCON_INTEL_INT3496=m
 # CONFIG_EXTCON is not set
 # CONFIG_EXTCON_QCOM_SPMI_MISC is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 50520adf2..38c353266 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -1241,7 +1241,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_CHT_WC=y
 CONFIG_EXTCON_INTEL_INT3496=m
 # CONFIG_EXTCON is not set
 # CONFIG_EXTCON_QCOM_SPMI_MISC is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index e0aec0f61..46228cdee 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -1230,7 +1230,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_CHT_WC=y
 CONFIG_EXTCON_INTEL_INT3496=m
 # CONFIG_EXTCON is not set
 # CONFIG_EXTCON_QCOM_SPMI_MISC is not set
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index 15bbe24a4..683ca7e45 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -1240,7 +1240,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_CHT_WC=y
 CONFIG_EXTCON_INTEL_INT3496=m
 # CONFIG_EXTCON is not set
 # CONFIG_EXTCON_QCOM_SPMI_MISC is not set
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index 68ad8ed06..6147d2731 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -1229,7 +1229,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_CHT_WC=y
 CONFIG_EXTCON_INTEL_INT3496=m
 # CONFIG_EXTCON is not set
 # CONFIG_EXTCON_QCOM_SPMI_MISC is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 52ce731db..9fceae43c 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1232,7 +1232,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_CHT_WC=y
 CONFIG_EXTCON_INTEL_INT3496=m
 # CONFIG_EXTCON is not set
 # CONFIG_EXTCON_QCOM_SPMI_MISC is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 23cd4eca0..4340b5855 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1221,7 +1221,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_CHT_WC=y
 CONFIG_EXTCON_INTEL_INT3496=m
 # CONFIG_EXTCON is not set
 # CONFIG_EXTCON_QCOM_SPMI_MISC is not set
diff --git a/kernel.spec b/kernel.spec
index 8f9f28c71..e8b17c7ef 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,9 +67,9 @@ Summary: The Linux kernel
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
-%global rcrev 1
+%global rcrev 2
 # The git snapshot level
-%define gitrev 4
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -125,7 +125,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 0
+%define debugbuildsenabled 1
 
 # Want to build a vanilla kernel build without any non-upstream patches?
 %define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0}
@@ -577,9 +577,6 @@ Patch308: bcm2837-initial-support.patch
 # http://www.spinics.net/lists/dri-devel/msg132235.html
 Patch309: drm-vc4-Fix-OOPSes-from-trying-to-cache-a-partially-constructed-BO..patch
 
-# Upstream fixes for i2c/serial/ethernet MAC addresses
-Patch310: bcm283x-fixes.patch
-
 # https://www.spinics.net/lists/arm-kernel/msg554183.html
 Patch311: arm-imx6-hummingboard2.patch
 
@@ -592,8 +589,6 @@ Patch312: arm64-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch
 # CVE-2017-7477 rhbz 1445207 1445208
 Patch502: CVE-2017-7477.patch
 
-Patch503: ARM-KVM-Fix-tracepoint-generation-after-move-to-virt-kvm-arm.patch
-
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -2166,6 +2161,10 @@ fi
 #
 #
 %changelog
+* Mon May 22 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.12.0-0.rc2.git0.1
+- Linux v4.12-rc2
+- Disable debugging options.
+
 * Fri May 19 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.12.0-0.rc1.git4.1
 - Linux v4.12-rc1-154-g8b4822d
 
diff --git a/sources b/sources
index 8f97bd346..eac71894d 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
 SHA512 (perf-man-4.11.tar.gz) = f6dec8c3a296fc5bb1dd58011d7d1340550b9f4f228169bab079b0b36f2d5d96784b808765acda2d547719f6e9fd73b2855ab825dfe4fea8af43c55e5786f8d6
 SHA512 (linux-4.11.tar.xz) = 6610eed97ffb7207c71771198c36179b8244ace7222bebb109507720e26c5f17d918079a56d5febdd8605844d67fb2df0ebe910fa2f2f53690daf6e2a8ad09c3
-SHA512 (patch-4.12-rc1.xz) = e6144938e8368d2c9dd2a05c68a3f73c2122088a1a09c7c3a63b4f16c4a77b2267f102324f3ecb20101b645b4613cfd24b8907048c76bceb9c2b7a0795e43c84
-SHA512 (patch-4.12-rc1-git4.xz) = d4c5f03e356ca050aa62dd77a834685e281cb1ffce196b09730d87cc274993bfca02787a051c175484571204c9e36b397035c23430b8172952ca341d9e888793
+SHA512 (patch-4.12-rc2.xz) = bfc00e528efecb2cf7ed751b81395d29c7d3ca50bb490ebae649920c0d6dbb8d10e1d04c3e209f640184057717572b514e037e1bbb9be251e8b43081edd0cbee