From 2e4edabdadb8680527580c8bf72a5c6f2c9fa92a Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Sun, 16 Jul 2017 07:55:59 +0100
Subject: [PATCH] v4.12.2

---
 baseconfig/arm/arm64/CONFIG_K3_DMA       | 2 +-
 baseconfig/arm/armv7/CONFIG_TWL4030_CORE | 1 -
 baseconfig/powerpc/CONFIG_TWL4030_CORE   | 1 -
 kernel-aarch64-debug.config              | 2 +-
 kernel-aarch64.config                    | 2 +-
 kernel.spec                              | 5 ++++-
 sources                                  | 2 +-
 7 files changed, 8 insertions(+), 7 deletions(-)
 delete mode 100644 baseconfig/arm/armv7/CONFIG_TWL4030_CORE
 delete mode 100644 baseconfig/powerpc/CONFIG_TWL4030_CORE

diff --git a/baseconfig/arm/arm64/CONFIG_K3_DMA b/baseconfig/arm/arm64/CONFIG_K3_DMA
index b698e7e5e..c64ec401c 100644
--- a/baseconfig/arm/arm64/CONFIG_K3_DMA
+++ b/baseconfig/arm/arm64/CONFIG_K3_DMA
@@ -1 +1 @@
-# CONFIG_K3_DMA is not set
+CONFIG_K3_DMA=m
diff --git a/baseconfig/arm/armv7/CONFIG_TWL4030_CORE b/baseconfig/arm/armv7/CONFIG_TWL4030_CORE
deleted file mode 100644
index 1f5b92782..000000000
--- a/baseconfig/arm/armv7/CONFIG_TWL4030_CORE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_TWL4030_CORE is not set
diff --git a/baseconfig/powerpc/CONFIG_TWL4030_CORE b/baseconfig/powerpc/CONFIG_TWL4030_CORE
deleted file mode 100644
index 1f5b92782..000000000
--- a/baseconfig/powerpc/CONFIG_TWL4030_CORE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_TWL4030_CORE is not set
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 8f5bc5dee..1c6c7dc02 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -2535,7 +2535,7 @@ CONFIG_JOYSTICK_XPAD=m
 CONFIG_JOYSTICK_ZHENHUA=m
 # CONFIG_JSA1212 is not set
 CONFIG_JUMP_LABEL=y
-# CONFIG_K3_DMA is not set
+CONFIG_K3_DMA=m
 CONFIG_KALLSYMS_ALL=y
 CONFIG_KALLSYMS=y
 CONFIG_KARMA_PARTITION=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 5676f5648..8c0c50b18 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -2518,7 +2518,7 @@ CONFIG_JOYSTICK_XPAD=m
 CONFIG_JOYSTICK_ZHENHUA=m
 # CONFIG_JSA1212 is not set
 CONFIG_JUMP_LABEL=y
-# CONFIG_K3_DMA is not set
+CONFIG_K3_DMA=m
 CONFIG_KALLSYMS_ALL=y
 CONFIG_KALLSYMS=y
 CONFIG_KARMA_PARTITION=y
diff --git a/kernel.spec b/kernel.spec
index 514f58e9b..af05b433e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 1
+%define stable_update 2
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -2215,6 +2215,9 @@ fi
 #
 #
 %changelog
+* Sun Jul 16 2017 Peter Robinson <pbrobinson@fedoraproject.org> 4.12.2-1
+- Linux v4.12.2
+
 * Wed Jul 12 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.12.1-1
 - Linux v4.12.1
 
diff --git a/sources b/sources
index 7c87caccc..81af3ab5a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (perf-man-4.12.tar.gz) = 4d3bbda1f520dba0007c351af46f45085fe4842074eb2e01aee736fd369df595f8f72ed6c1192715f1120bf3353279777f9dca1178fe93bffe5be2de700d409c
 SHA512 (linux-4.12.tar.xz) = 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728
-SHA512 (patch-4.12.1.xz) = 41a3a6943659c05ec58e953215e5125027817be6867ee88b8faf0ac9c89f32876d5df865347be78bfb3fd9b0e4bcd07b84b6fcc6d7a60720280ce502f2d3af93
+SHA512 (patch-4.12.2.xz) = 3d3e7cea82b20ba841d74f6f63e635143a52ee1428017792aa210ee591fcccf7ee1475c1576257722f0f5891547b69a192d48723ab6f4c189841e17ed8013300