Merge remote-tracking branch 'origin/master'kernel-4.12.0-0.rc1.git2.1.vanilla.knurd.1.fc27kernel-4.12.0-0.rc1.git2.1.vanilla.knurd.1.fc26kernel-4.12.0-0.rc1.git2.1.vanilla.knurd.1.fc25kernel-4.12.0-0.rc1.git2.1.vanilla.knurd.1.fc24

26 files changed, 82 insertions, 232 deletions

diff --git a/baseconfig/CONFIG_HD44780 b/baseconfig/CONFIG_HD44780
index 4254ce45e..22e6cf3b3 100644
--- a/baseconfig/CONFIG_HD44780
+++ b/baseconfig/CONFIG_HD44780
@@ -1 +1 @@
-# CONFIG_HD44780 is not set
+CONFIG_HD44780=m
diff --git a/drm-i915-turn-off-wc-mmaps.patch b/drm-i915-turn-off-wc-mmaps.patch
deleted file mode 100644
index c81b89226..000000000
--- a/drm-i915-turn-off-wc-mmaps.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Dave Airlie <airlied@redhat.com>
-Date: Thu, 4 Jun 2015 07:12:20 -0400
-Subject: [PATCH] drm: i915: turn off wc mmaps
-
----
- drivers/gpu/drm/i915/i915_dma.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
-index d2df321ba634..775a5b11a366 100644
---- a/drivers/gpu/drm/i915/i915_dma.c
-+++ b/drivers/gpu/drm/i915/i915_dma.c
-@@ -151,7 +151,7 @@ static int i915_getparam(struct drm_device *dev, void *data,
- 		value = 1;
- 		break;
- 	case I915_PARAM_MMAP_VERSION:
--		value = 1;
-+		value = 0;
- 		break;
- 	case I915_PARAM_SUBSLICE_TOTAL:
- 		value = INTEL_INFO(dev)->subslice_total;
diff --git a/geekbox-v4-device-tree-support.patch b/geekbox-v4-device-tree-support.patch
deleted file mode 100644
index 2ea4bd649..000000000
--- a/geekbox-v4-device-tree-support.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From 11aa129d33635fb33304b6e9b945e502f5ba707a Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Thu, 17 Mar 2016 15:19:04 +0000
-Subject: [PATCH] geekbox v4 patchset
-
----
- Documentation/devicetree/bindings/arm/rockchip.txt |  9 ++++
- arch/arm64/boot/dts/rockchip/Makefile              |  1 +
- arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi       |  2 +-
- .../dts/rockchip/rk3368-geekbox-landingship.dts    | 57 ++++++++++++++++++++++
- arch/arm64/boot/dts/rockchip/rk3368-r88.dts        |  2 +-
- 5 files changed, 69 insertions(+), 2 deletions(-)
- create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-geekbox-landingship.dts
-
-diff --git a/Documentation/devicetree/bindings/arm/rockchip.txt b/Documentation/devicetree/bindings/arm/rockchip.txt
-index 55f388f..989a039 100644
---- a/Documentation/devicetree/bindings/arm/rockchip.txt
-+++ b/Documentation/devicetree/bindings/arm/rockchip.txt
-@@ -99,6 +99,15 @@ Rockchip platforms device tree bindings
-     Required root node properties:
-       - compatible = "rockchip,rk1108-evb", "rockchip,rk1108";
- 
-+- GeekBuying GeekBox:
-+    Required root node properties:
-+      - compatible = "geekbuying,geekbox", "rockchip,rk3368";
-+
-+- GeekBuying Landingship with GeekBox module:
-+    Required root node properties:
-+      - compatible = "geekbuying,geekbox-landingship",
-+		     "geekbuying,geekbox", "rockchip,rk3368";
-+
- - Rockchip RK3368 evb:
-     Required root node properties:
-       - compatible = "rockchip,rk3368-evb-act8846", "rockchip,rk3368";
-diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
-index 87669f6..9aec54e 100644
---- a/arch/arm64/boot/dts/rockchip/Makefile
-+++ b/arch/arm64/boot/dts/rockchip/Makefile
-@@ -2,6 +2,7 @@
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-evb-act8846.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-geekbox.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-orion-r68-meta.dtb
-+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-geekbox-landingship.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-px5-evb.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb.dtb
-diff --git a/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi
-index fff8b19..bd4f2cf 100644
---- a/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi
-@@ -49,7 +49,7 @@
- 		stdout-path = "serial2:115200n8";
- 	};
- 
--	memory {
-+	memory@0 {
- 		device_type = "memory";
- 		reg = <0x0 0x0 0x0 0x40000000>;
- 	};
-diff --git a/arch/arm64/boot/dts/rockchip/rk3368-geekbox-landingship.dts b/arch/arm64/boot/dts/rockchip/rk3368-geekbox-landingship.dts
-new file mode 100644
-index 0000000..a28ace9
---- /dev/null
-+++ b/arch/arm64/boot/dts/rockchip/rk3368-geekbox-landingship.dts
-@@ -0,0 +1,57 @@
-+/*
-+ * Copyright (c) 2016 Andreas Färber
-+ *
-+ * This file is dual-licensed: you can use it either under the terms
-+ * of the GPL or the X11 license, at your option. Note that this dual
-+ * licensing only applies to this file, and not this project as a
-+ * whole.
-+ *
-+ *  a) This file is free software; you can redistribute it and/or
-+ *     modify it under the terms of the GNU General Public License as
-+ *     published by the Free Software Foundation; either version 2 of the
-+ *     License, or (at your option) any later version.
-+ *
-+ *     This file is distributed in the hope that it will be useful,
-+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *     GNU General Public License for more details.
-+ *
-+ * Or, alternatively,
-+ *
-+ *  b) Permission is hereby granted, free of charge, to any person
-+ *     obtaining a copy of this software and associated documentation
-+ *     files (the "Software"), to deal in the Software without
-+ *     restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or
-+ *     sell copies of the Software, and to permit persons to whom the
-+ *     Software is furnished to do so, subject to the following
-+ *     conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be
-+ *     included in all copies or substantial portions of the Software.
-+ *
-+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+ *     OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+#include "rk3368-geekbox.dts"
-+
-+/ {
-+	model = "GeekBox on Landingship";
-+	compatible = "geekbuying,geekbox-landingship",
-+		     "geekbuying,geekbox", "rockchip,rk3368";
-+};
-+
-+&i2c1 {
-+	status = "disabled";
-+};
-+
-+&i2c2 {
-+	status = "okay";
-+};
-diff --git a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
-index eed1ef6..18e2b77 100644
---- a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
-@@ -52,7 +52,7 @@
- 		stdout-path = "serial2:115200n8";
- 	};
- 
--	memory {
-+	memory@0 {
- 		device_type = "memory";
- 		reg = <0x0 0x0 0x0 0x40000000>;
- 	};
--- 
-2.7.4
-
diff --git a/gitrev b/gitrev
index 60a84e453..01b7c12e1 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-a95cfad947d5f40cfbf9ad3019575aac1d8ac7a6
+b23afd384801711ab6dbccd259cc14cb09a1dcaf
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index eb4eba4a8..ba738ab4d 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1747,7 +1747,7 @@ CONFIG_HAPPYMEAL=m
 CONFIG_HARDENED_USERCOPY=y
 CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-# CONFIG_HD44780 is not set
+CONFIG_HD44780=m
 # CONFIG_HDC100X is not set
 CONFIG_HEADERS_CHECK=y
 CONFIG_HERMES_CACHE_FW_ON_INIT=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 2a01f0ed3..2c1e86bbf 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1730,7 +1730,7 @@ CONFIG_HAPPYMEAL=m
 CONFIG_HARDENED_USERCOPY=y
 CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-# CONFIG_HD44780 is not set
+CONFIG_HD44780=m
 # CONFIG_HDC100X is not set
 CONFIG_HEADERS_CHECK=y
 CONFIG_HERMES_CACHE_FW_ON_INIT=y
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 6f1247cba..894a70201 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1888,7 +1888,7 @@ CONFIG_HAVE_ARM_ARCH_TIMER=y
 CONFIG_HAVE_ARM_TWD=y
 CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-# CONFIG_HD44780 is not set
+CONFIG_HD44780=m
 # CONFIG_HDC100X is not set
 CONFIG_HDQ_MASTER_OMAP=m
 CONFIG_HEADERS_CHECK=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 174de9ba7..5f805dcbf 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1793,7 +1793,7 @@ CONFIG_HAVE_ARM_ARCH_TIMER=y
 CONFIG_HAVE_ARM_TWD=y
 CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-# CONFIG_HD44780 is not set
+CONFIG_HD44780=m
 # CONFIG_HDC100X is not set
 CONFIG_HEADERS_CHECK=y
 CONFIG_HERMES_CACHE_FW_ON_INIT=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 4204f2e52..690b59183 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1776,7 +1776,7 @@ CONFIG_HAVE_ARM_ARCH_TIMER=y
 CONFIG_HAVE_ARM_TWD=y
 CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-# CONFIG_HD44780 is not set
+CONFIG_HD44780=m
 # CONFIG_HDC100X is not set
 CONFIG_HEADERS_CHECK=y
 CONFIG_HERMES_CACHE_FW_ON_INIT=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 1db8e0725..a03f83ff9 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1871,7 +1871,7 @@ CONFIG_HAVE_ARM_ARCH_TIMER=y
 CONFIG_HAVE_ARM_TWD=y
 CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-# CONFIG_HD44780 is not set
+CONFIG_HD44780=m
 # CONFIG_HDC100X is not set
 CONFIG_HDQ_MASTER_OMAP=m
 CONFIG_HEADERS_CHECK=y
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 457381a53..e81c305b3 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -1628,7 +1628,7 @@ CONFIG_HAMRADIO=y
 CONFIG_HANGCHECK_TIMER=m
 CONFIG_HAPPYMEAL=m
 CONFIG_HARDENED_USERCOPY=y
-# CONFIG_HD44780 is not set
+CONFIG_HD44780=m
 # CONFIG_HDC100X is not set
 CONFIG_HDMI_LPE_AUDIO=m
 CONFIG_HEADERS_CHECK=y
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index e06d48d54..db4c7c4c7 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -1646,7 +1646,7 @@ CONFIG_HAMRADIO=y
 CONFIG_HANGCHECK_TIMER=m
 CONFIG_HAPPYMEAL=m
 CONFIG_HARDENED_USERCOPY=y
-# CONFIG_HD44780 is not set
+CONFIG_HD44780=m
 # CONFIG_HDC100X is not set
 CONFIG_HDMI_LPE_AUDIO=m
 CONFIG_HEADERS_CHECK=y
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 26c737024..3c79b48e6 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -1646,7 +1646,7 @@ CONFIG_HAMRADIO=y
 CONFIG_HANGCHECK_TIMER=m
 CONFIG_HAPPYMEAL=m
 CONFIG_HARDENED_USERCOPY=y
-# CONFIG_HD44780 is not set
+CONFIG_HD44780=m
 # CONFIG_HDC100X is not set
 CONFIG_HDMI_LPE_AUDIO=m
 CONFIG_HEADERS_CHECK=y
diff --git a/kernel-i686.config b/kernel-i686.config
index a426171d1..8aacfa7f0 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -1628,7 +1628,7 @@ CONFIG_HAMRADIO=y
 CONFIG_HANGCHECK_TIMER=m
 CONFIG_HAPPYMEAL=m
 CONFIG_HARDENED_USERCOPY=y
-# CONFIG_HD44780 is not set
+CONFIG_HD44780=m
 # CONFIG_HDC100X is not set
 CONFIG_HDMI_LPE_AUDIO=m
 CONFIG_HEADERS_CHECK=y
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index ceac2e602..7ba3b3bd3 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -1554,7 +1554,7 @@ CONFIG_HAPPYMEAL=m
 CONFIG_HARDENED_USERCOPY=y
 CONFIG_HAVE_BOOTMEM_INFO_NODE=y
 # CONFIG_HCALL_STATS is not set
-# CONFIG_HD44780 is not set
+CONFIG_HD44780=m
 # CONFIG_HDC100X is not set
 CONFIG_HEADERS_CHECK=y
 CONFIG_HERMES_CACHE_FW_ON_INIT=y
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 40d628a79..8faf42811 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -1536,7 +1536,7 @@ CONFIG_HAPPYMEAL=m
 CONFIG_HARDENED_USERCOPY=y
 CONFIG_HAVE_BOOTMEM_INFO_NODE=y
 # CONFIG_HCALL_STATS is not set
-# CONFIG_HD44780 is not set
+CONFIG_HD44780=m
 # CONFIG_HDC100X is not set
 CONFIG_HEADERS_CHECK=y
 CONFIG_HERMES_CACHE_FW_ON_INIT=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index ac4ade338..50520adf2 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -1508,7 +1508,7 @@ CONFIG_HAPPYMEAL=m
 CONFIG_HARDENED_USERCOPY=y
 CONFIG_HAVE_BOOTMEM_INFO_NODE=y
 # CONFIG_HCALL_STATS is not set
-# CONFIG_HD44780 is not set
+CONFIG_HD44780=m
 # CONFIG_HDC100X is not set
 CONFIG_HEADERS_CHECK=y
 CONFIG_HERMES_CACHE_FW_ON_INIT=y
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index c1adb191c..e0aec0f61 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -1490,7 +1490,7 @@ CONFIG_HAPPYMEAL=m
 CONFIG_HARDENED_USERCOPY=y
 CONFIG_HAVE_BOOTMEM_INFO_NODE=y
 # CONFIG_HCALL_STATS is not set
-# CONFIG_HD44780 is not set
+CONFIG_HD44780=m
 # CONFIG_HDC100X is not set
 CONFIG_HEADERS_CHECK=y
 CONFIG_HERMES_CACHE_FW_ON_INIT=y
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index c3ddeb886..15bbe24a4 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -1507,7 +1507,7 @@ CONFIG_HAPPYMEAL=m
 CONFIG_HARDENED_USERCOPY=y
 CONFIG_HAVE_BOOTMEM_INFO_NODE=y
 # CONFIG_HCALL_STATS is not set
-# CONFIG_HD44780 is not set
+CONFIG_HD44780=m
 # CONFIG_HDC100X is not set
 CONFIG_HEADERS_CHECK=y
 CONFIG_HERMES_CACHE_FW_ON_INIT=y
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index 12eb430b7..68ad8ed06 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -1489,7 +1489,7 @@ CONFIG_HAPPYMEAL=m
 CONFIG_HARDENED_USERCOPY=y
 CONFIG_HAVE_BOOTMEM_INFO_NODE=y
 # CONFIG_HCALL_STATS is not set
-# CONFIG_HD44780 is not set
+CONFIG_HD44780=m
 # CONFIG_HDC100X is not set
 CONFIG_HEADERS_CHECK=y
 CONFIG_HERMES_CACHE_FW_ON_INIT=y
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 08d6db2be..52ce731db 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1472,7 +1472,7 @@ CONFIG_HAMRADIO=y
 CONFIG_HANGCHECK_TIMER=m
 CONFIG_HAPPYMEAL=m
 CONFIG_HARDENED_USERCOPY=y
-# CONFIG_HD44780 is not set
+CONFIG_HD44780=m
 # CONFIG_HDC100X is not set
 CONFIG_HEADERS_CHECK=y
 CONFIG_HERMES_CACHE_FW_ON_INIT=y
diff --git a/kernel-s390x.config b/kernel-s390x.config
index cc3416241..23cd4eca0 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1454,7 +1454,7 @@ CONFIG_HAMRADIO=y
 CONFIG_HANGCHECK_TIMER=m
 CONFIG_HAPPYMEAL=m
 CONFIG_HARDENED_USERCOPY=y
-# CONFIG_HD44780 is not set
+CONFIG_HD44780=m
 # CONFIG_HDC100X is not set
 CONFIG_HEADERS_CHECK=y
 CONFIG_HERMES_CACHE_FW_ON_INIT=y
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index da77faa14..e6d37deca 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -1672,7 +1672,7 @@ CONFIG_HANGCHECK_TIMER=m
 CONFIG_HAPPYMEAL=m
 CONFIG_HARDENED_USERCOPY=y
 CONFIG_HAVE_MEMORY_PRESENT=y
-# CONFIG_HD44780 is not set
+CONFIG_HD44780=m
 # CONFIG_HDC100X is not set
 CONFIG_HDMI_LPE_AUDIO=m
 CONFIG_HEADERS_CHECK=y
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 484a75216..0aba29be5 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -1654,7 +1654,7 @@ CONFIG_HANGCHECK_TIMER=m
 CONFIG_HAPPYMEAL=m
 CONFIG_HARDENED_USERCOPY=y
 CONFIG_HAVE_MEMORY_PRESENT=y
-# CONFIG_HD44780 is not set
+CONFIG_HD44780=m
 # CONFIG_HDC100X is not set
 CONFIG_HDMI_LPE_AUDIO=m
 CONFIG_HEADERS_CHECK=y
diff --git a/kernel.spec b/kernel.spec
index 39fb45b5f..142af4a6a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 1
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -522,94 +522,100 @@ Patch002: 0001-iio-Use-event-header-from-kernel-tree.patch
 # Git trees.
 
 # Standalone patches
+# 100 - Generic long running patches
 
-# a tempory patch for QCOM hardware enablement. Will be gone by end of 2016/F-26 GA
-Patch420: qcom-QDF2432-tmp-errata.patch
+Patch110: lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
 
-# http://www.spinics.net/lists/arm-kernel/msg490981.html
-Patch421: geekbox-v4-device-tree-support.patch
+Patch111: input-kill-stupid-messages.patch
 
-# http://www.spinics.net/lists/linux-tegra/msg26029.html
-Patch422: usb-phy-tegra-Add-38.4MHz-clock-table-entry.patch
+Patch112: die-floppy-die.patch
 
-# Fix OMAP4 (pandaboard)
-Patch423: arm-revert-mmc-omap_hsmmc-Use-dma_request_chan-for-reque.patch
+Patch113: no-pcspkr-modalias.patch
 
-# Not particularly happy we don't yet have a proper upstream resolution this is the right direction
-# https://www.spinics.net/lists/arm-kernel/msg535191.html
-Patch424: arm64-mm-Fix-memmap-to-be-initialized-for-the-entire-section.patch
+Patch114: silence-fbcon-logo.patch
 
-# http://patchwork.ozlabs.org/patch/587554/
-Patch425: ARM-tegra-usb-no-reset.patch
+Patch115: Kbuild-Add-an-option-to-enable-GCC-VTA.patch
 
-Patch427: AllWinner-net-emac.patch
+Patch116: crash-driver.patch
 
-Patch429: arm64-hikey-fixes.patch
+Patch117: lis3-improve-handling-of-null-rate.patch
 
-# http://www.spinics.net/lists/devicetree/msg163238.html
-Patch430: bcm2837-initial-support.patch
+Patch118: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
 
-# http://www.spinics.net/lists/dri-devel/msg132235.html
-Patch433: drm-vc4-Fix-OOPSes-from-trying-to-cache-a-partially-constructed-BO..patch
+Patch119: criu-no-expert.patch
 
-# Upstream fixes for i2c/serial/ethernet MAC addresses
-Patch435: bcm283x-fixes.patch
+Patch120: ath9k-rx-dma-stop-check.patch
 
-# https://www.spinics.net/lists/arm-kernel/msg554183.html
-Patch438: arm-imx6-hummingboard2.patch
+Patch121: xen-pciback-Don-t-disable-PCI_COMMAND-on-PCI-device-.patch
+
+Patch122: Input-synaptics-pin-3-touches-when-the-firmware-repo.patch
+
+Patch123: firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch
 
-Patch440: arm64-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch
+# 200 - x86 / secureboot
 
-Patch460: lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
+Patch201: efi-lockdown.patch
 
-Patch466: input-kill-stupid-messages.patch
+Patch202: KEYS-Allow-unrestricted-boot-time-addition-of-keys-t.patch
 
-Patch467: die-floppy-die.patch
+Patch203: Add-EFI-signature-data-types.patch
 
-Patch468: no-pcspkr-modalias.patch
+Patch204: Add-an-EFI-signature-blob-parser-and-key-loader.patch
 
-Patch470: silence-fbcon-logo.patch
+Patch205: MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
 
-Patch471: Kbuild-Add-an-option-to-enable-GCC-VTA.patch
+Patch206: MODSIGN-Support-not-importing-certs-from-db.patch
 
-Patch472: crash-driver.patch
+Patch210: disable-i8042-check-on-apple-mac.patch
 
-Patch473: efi-lockdown.patch
+Patch211: drm-i915-hush-check-crtc-state.patch
 
-Patch486: KEYS-Allow-unrestricted-boot-time-addition-of-keys-t.patch
+# Patch212: drm-i915-turn-off-wc-mmaps.patch
 
-Patch487: Add-EFI-signature-data-types.patch
+# 300 - ARM patches
 
-Patch488: Add-an-EFI-signature-blob-parser-and-key-loader.patch
+# a tempory patch for QCOM hardware enablement. Will be gone by F-26 GA
+Patch301: qcom-QDF2432-tmp-errata.patch
 
-Patch490: MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
+# http://www.spinics.net/lists/linux-tegra/msg26029.html
+Patch102: usb-phy-tegra-Add-38.4MHz-clock-table-entry.patch
 
-Patch491: MODSIGN-Support-not-importing-certs-from-db.patch
+# Fix OMAP4 (pandaboard)
+Patch303: arm-revert-mmc-omap_hsmmc-Use-dma_request_chan-for-reque.patch
 
-Patch493: drm-i915-hush-check-crtc-state.patch
+# Not particularly happy we don't yet have a proper upstream resolution this is the right direction
+# https://www.spinics.net/lists/arm-kernel/msg535191.html
+Patch304: arm64-mm-Fix-memmap-to-be-initialized-for-the-entire-section.patch
 
-Patch494: disable-i8042-check-on-apple-mac.patch
+# http://patchwork.ozlabs.org/patch/587554/
+Patch305: ARM-tegra-usb-no-reset.patch
 
-Patch495: lis3-improve-handling-of-null-rate.patch
+Patch306: AllWinner-net-emac.patch
 
-Patch497: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
+Patch307: arm64-hikey-fixes.patch
 
-Patch498: criu-no-expert.patch
+# http://www.spinics.net/lists/devicetree/msg163238.html
+Patch308: bcm2837-initial-support.patch
 
-Patch499: ath9k-rx-dma-stop-check.patch
+# http://www.spinics.net/lists/dri-devel/msg132235.html
+Patch309: drm-vc4-Fix-OOPSes-from-trying-to-cache-a-partially-constructed-BO..patch
 
-Patch500: xen-pciback-Don-t-disable-PCI_COMMAND-on-PCI-device-.patch
+# Upstream fixes for i2c/serial/ethernet MAC addresses
+Patch310: bcm283x-fixes.patch
 
-Patch501: Input-synaptics-pin-3-touches-when-the-firmware-repo.patch
+# https://www.spinics.net/lists/arm-kernel/msg554183.html
+Patch311: arm-imx6-hummingboard2.patch
 
-Patch502: firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch
+Patch312: arm64-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch
 
-# Patch503: drm-i915-turn-off-wc-mmaps.patch
+# 400 - IBM (ppc/s390x) patches
+
+# 500 - Temp fixes/CVEs etc
 
 # CVE-2017-7477 rhbz 1445207 1445208
-Patch668: CVE-2017-7477.patch
+Patch502: CVE-2017-7477.patch
 
-Patch679: ARM-KVM-Fix-tracepoint-generation-after-move-to-virt-kvm-arm.patch
+Patch503: ARM-KVM-Fix-tracepoint-generation-after-move-to-virt-kvm-arm.patch
 
 # END OF PATCH DEFINITIONS
 
@@ -2186,6 +2192,9 @@ fi
 #
 #
 %changelog
+* Wed May 17 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.12.0-0.rc1.git2.1
+- Linux v4.12-rc1-81-gb23afd3
+
 * Tue May 16 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.12.0-0.rc1.git1.1
 - Linux v4.12-rc1-66-ga95cfad
 - Reenable debugging options.
diff --git a/sources b/sources
index 0e8f7fd1e..355132eba 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 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-git1.xz) = a5edb8788b7cbbd1fcd3b67aebe551701ee73216b3618d4d20990c196fa8d68977456031e421f248a40029ddd7dae89cc16b9081f00c0ca73d3e7c9cb1806817
+SHA512 (patch-4.12-rc1-git2.xz) = 72d8224e3d448f29697db8f34849916cd1d1dad57f6bb2e6de3b636b0a7363cc7ec6ac0e12cb44070718b4276eb2fab0bf033a4375e5c84f4311593a827dca4b