summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--baseconfig/s390x/CONFIG_RMI4_F031
-rw-r--r--gitrev2
-rw-r--r--kernel-s390x-debug.config2
-rw-r--r--kernel-s390x.config2
-rw-r--r--kernel.spec5
-rw-r--r--sources2
6 files changed, 9 insertions, 5 deletions
diff --git a/baseconfig/s390x/CONFIG_RMI4_F03 b/baseconfig/s390x/CONFIG_RMI4_F03
new file mode 100644
index 000000000..effd70c36
--- /dev/null
+++ b/baseconfig/s390x/CONFIG_RMI4_F03
@@ -0,0 +1 @@
+# CONFIG_RMI4_F03 is not set
diff --git a/gitrev b/gitrev
index 71a596ec8..ad99c1c74 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-926af6273fc683cd98cd0ce7bf0d04a02eed6742
+55aac6ef53e114c28170ee3f79065cfa8ca9cf3f
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index d040d077d..005eefbaa 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -3707,7 +3707,7 @@ CONFIG_RING_BUFFER_BENCHMARK=m
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
# CONFIG_RIO is not set
CONFIG_RMI4_CORE=m
-CONFIG_RMI4_F03=y
+# CONFIG_RMI4_F03 is not set
CONFIG_RMI4_F11=y
CONFIG_RMI4_F12=y
CONFIG_RMI4_F30=y
diff --git a/kernel-s390x.config b/kernel-s390x.config
index b90aaab80..53a1ef4a4 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -3685,7 +3685,7 @@ CONFIG_RING_BUFFER_BENCHMARK=m
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
# CONFIG_RIO is not set
CONFIG_RMI4_CORE=m
-CONFIG_RMI4_F03=y
+# CONFIG_RMI4_F03 is not set
CONFIG_RMI4_F11=y
CONFIG_RMI4_F12=y
CONFIG_RMI4_F30=y
diff --git a/kernel.spec b/kernel.spec
index aede923fb..b437e8495 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 7
# The git snapshot level
-%define gitrev 2
+%define gitrev 3
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -2172,6 +2172,9 @@ fi
#
#
%changelog
+* Thu Feb 09 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc7.git3.1
+- Linux v4.10-rc7-114-g55aac6e
+
* Thu Feb 9 2017 Peter Robinson <pbrobinson@fedoraproject.org>
- Fix OOPSes in vc4 (Raspberry Pi)
diff --git a/sources b/sources
index 7ddd1de66..37d25b00e 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
SHA512 (linux-4.9.tar.xz) = bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
SHA512 (perf-man-4.9.tar.gz) = d23bb3da1eadd6623fddbf4696948de7675f3dcf57c711a7427dd7ae111394f58d8f42752938bbea7cd219f1e7f6f116fc67a1c74f769711063940a065f37b99
SHA512 (patch-4.10-rc7.xz) = 206e5e97581bb376141398b6962fbbc4ee0a58b50fae1de83f3f6f3c06502b260f006628aab738d63994a6d1c0276717d49e882a8107b8f9c24d565a2a70ea9b
-SHA512 (patch-4.10-rc7-git2.xz) = eab140627e4d14eabe40b69c34e50418fa9ec5602506e2a5d80b92de11b182ef86378df64461770767e667ac0045d988ca3c22d7509786088e4bd9945d0eb233
+SHA512 (patch-4.10-rc7-git3.xz) = 09ca5268d4e4b3ef82a086f2a2496adf47d522b3e98b9c020ffad9078f4af381f06c61140a726f1b6b2611ee014637eaac76e0df04c03e123609b742a09ac801