Merge remote-tracking branch 'origin/master'kernel-4.10.0-0.rc2.git1.1.vanilla.knurd.1.fc25kernel-4.10.0-0.rc2.git1.1.vanilla.knurd.1.fc24

15 files changed, 23 insertions, 14 deletions

diff --git a/baseconfig/CONFIG_CPUMASK_OFFSTACK b/baseconfig/CONFIG_CPUMASK_OFFSTACK
index 6e4f61ead..aa9b7f323 100644
--- a/baseconfig/CONFIG_CPUMASK_OFFSTACK
+++ b/baseconfig/CONFIG_CPUMASK_OFFSTACK
@@ -1 +1 @@
-# CONFIG_CPUMASK_OFFSTACK is not set
+CONFIG_CPUMASK_OFFSTACK=y
diff --git a/debugconfig/CONFIG_CPUMASK_OFFSTACK b/debugconfig/CONFIG_CPUMASK_OFFSTACK
deleted file mode 100644
index aa9b7f323..000000000
--- a/debugconfig/CONFIG_CPUMASK_OFFSTACK
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CPUMASK_OFFSTACK=y
diff --git a/gitrev b/gitrev
index 1f4c7cf02..844c51308 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-0c744ea4f77d72b3dcebb7a8f2684633ec79be88
+0f64df30124018de92c7f22a044b975da8dd52cc
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index c33da88ca..f90863fbc 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -903,7 +903,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE=y
-# CONFIG_CPUMASK_OFFSTACK is not set
+CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPUSETS=y
 CONFIG_CPU_THERMAL=y
 CONFIG_CRAMFS=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 56aa69084..8296f17b8 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -933,7 +933,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE=y
-# CONFIG_CPUMASK_OFFSTACK is not set
+CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPUSETS=y
 # CONFIG_CPU_SW_DOMAIN_PAN is not set
 CONFIG_CPU_THERMAL=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 3c354b26b..3d1c94c11 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -959,7 +959,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE=y
-# CONFIG_CPUMASK_OFFSTACK is not set
+CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPUSETS=y
 CONFIG_CPU_SW_DOMAIN_PAN=y
 CONFIG_CPU_THERMAL=y
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index f51a2a39d..94cf3c0d9 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -789,7 +789,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE=y
-# CONFIG_CPUMASK_OFFSTACK is not set
+CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPUSETS=y
 # CONFIG_CPU_THERMAL is not set
 CONFIG_CRAMFS=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 7b81384a7..69e4c0aa3 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -789,7 +789,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE=y
-# CONFIG_CPUMASK_OFFSTACK is not set
+CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPUSETS=y
 # CONFIG_CPU_THERMAL is not set
 CONFIG_CRAMFS=m
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 31b17d1db..6cfd9463d 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -788,7 +788,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE=y
 # CONFIG_CPU_LITTLE_ENDIAN is not set
-# CONFIG_CPUMASK_OFFSTACK is not set
+CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPUSETS=y
 # CONFIG_CPU_THERMAL is not set
 CONFIG_CRAMFS=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 368fd3342..0235c348e 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -743,7 +743,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_LITTLE_ENDIAN=y
-# CONFIG_CPUMASK_OFFSTACK is not set
+CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPUSETS=y
 # CONFIG_CPU_THERMAL is not set
 CONFIG_CRAMFS=m
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index bf35338c1..072e3014f 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -743,7 +743,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE=y
 # CONFIG_CPU_LITTLE_ENDIAN is not set
-# CONFIG_CPUMASK_OFFSTACK is not set
+CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPUSETS=y
 # CONFIG_CPU_THERMAL is not set
 CONFIG_CRAMFS=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 07d4fcc91..77f04da58 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -739,7 +739,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 # CONFIG_CPU_IDLE is not set
-# CONFIG_CPUMASK_OFFSTACK is not set
+CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPUSETS=y
 # CONFIG_CPU_THERMAL is not set
 CONFIG_CRAMFS=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 63e064ac5..707e657ec 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -796,7 +796,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE=y
-# CONFIG_CPUMASK_OFFSTACK is not set
+CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPUSETS=y
 # CONFIG_CPU_THERMAL is not set
 CONFIG_CRAMFS=m
diff --git a/kernel.spec b/kernel.spec
index 9a1533472..4e795c612 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 2
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -2174,6 +2174,15 @@ fi
 #
 #
 %changelog
+* Tue Jan 03 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc2.git1.1
+- Linux v4.10-rc2-20-g0f64df3
+
+* Tue Jan 03 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc2.git0.3
+- Reenable debugging options.
+
+* Tue Jan 03 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc2.git0.2
+- Disable debugging options.
+
 * Mon Jan 02 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc2.git0.1
 - Linux v4.10-rc2
 
diff --git a/sources b/sources
index 5fab23e54..bae15b9be 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 SHA512 (linux-4.9.tar.xz) = bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
 SHA512 (perf-man-4.9.tar.gz) = d23bb3da1eadd6623fddbf4696948de7675f3dcf57c711a7427dd7ae111394f58d8f42752938bbea7cd219f1e7f6f116fc67a1c74f769711063940a065f37b99
 SHA512 (patch-4.10-rc2.xz) = 45ec25c586aa89e4e8dd53cf01a88e25331e379a2532a7059eb182a634279c92e23d057c71df10ceb374fcc51c3a4eed6769261a7e2b9c5cd0112a81161ff597
+SHA512 (patch-4.10-rc2-git1.xz) = cedf67eb811f494dd561a7e6fdffb14b00c359ddc45c47cbe301824fca102991b7eb1406c5feb186f5b69ef69ed1a953bccd72064d83703930c43e96c93e1f58