Merge remote-tracking branch 'origin/master'kernel-4.10.0-0.rc8.git2.1.vanilla.knurd.1.fc26kernel-4.10.0-0.rc8.git2.1.vanilla.knurd.1.fc25kernel-4.10.0-0.rc8.git2.1.vanilla.knurd.1.fc24

7 files changed, 47 insertions, 6 deletions

diff --git a/0001-i2c-bcm2835-Debug-test-for-curr_msg.patch b/0001-i2c-bcm2835-Debug-test-for-curr_msg.patch
new file mode 100644
index 000000000..4d4f0cb0f
--- /dev/null
+++ b/0001-i2c-bcm2835-Debug-test-for-curr_msg.patch
@@ -0,0 +1,29 @@
+From 81c53729ee7c7f721c357ed3b531ebc97ca44051 Mon Sep 17 00:00:00 2001
+From: Eric Anholt <eric@anholt.net>
+Date: Wed, 15 Feb 2017 11:57:57 -0800
+Subject: [PATCH] i2c-bcm2835: Debug test for curr_msg
+
+Signed-off-by: Eric Anholt <eric@anholt.net>
+---
+ drivers/i2c/busses/i2c-bcm2835.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c
+index c3436f627028..a75fab4dd660 100644
+--- a/drivers/i2c/busses/i2c-bcm2835.c
++++ b/drivers/i2c/busses/i2c-bcm2835.c
+@@ -195,7 +195,10 @@ static irqreturn_t bcm2835_i2c_isr(int this_irq, void *data)
+ 	}
+ 
+ 	if (val & BCM2835_I2C_S_DONE) {
+-		if (i2c_dev->curr_msg->flags & I2C_M_RD) {
++		if (!i2c_dev->curr_msg) {
++			dev_info(i2c_dev->dev,
++				 "Processing DONE interrupt with no msg\n");
++		} else if (i2c_dev->curr_msg->flags & I2C_M_RD) {
+ 			bcm2835_drain_rxfifo(i2c_dev);
+ 			val = bcm2835_i2c_readl(i2c_dev, BCM2835_I2C_S);
+ 		}
+-- 
+2.11.0
+
diff --git a/baseconfig/s390x/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED b/baseconfig/s390x/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED
index 5f7402180..4b6d5fcee 100644
--- a/baseconfig/s390x/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED
+++ b/baseconfig/s390x/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED
@@ -1 +1 @@
-CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
+# CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set
diff --git a/gitrev b/gitrev
index 55c2d627c..25e9defc9 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-3d88460dbd285e7f32437b530d5bb7cb916142fa
+6dc39c50e4aeb769c8ae06edf2b1a732f3490913
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index e2b8583e7..cd3b70250 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -3331,7 +3331,7 @@ CONFIG_NSC_FIR=m
 # CONFIG_NTB is not set
 # CONFIG_NTFS_FS is not set
 CONFIG_NTP_PPS=y
-CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
+# CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set
 CONFIG_NUMA_BALANCING=y
 CONFIG_NUMA_EMU=y
 CONFIG_NUMA=y
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 157774296..1d8139bdf 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -3310,7 +3310,7 @@ CONFIG_NSC_FIR=m
 # CONFIG_NTB is not set
 # CONFIG_NTFS_FS is not set
 CONFIG_NTP_PPS=y
-CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
+# CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set
 CONFIG_NUMA_BALANCING=y
 CONFIG_NUMA_EMU=y
 CONFIG_NUMA=y
diff --git a/kernel.spec b/kernel.spec
index 73df37049..2051d433c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -44,7 +44,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 2
+%global baserelease 1
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 8
 # The git snapshot level
-%define gitrev 0
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -550,6 +550,10 @@ Patch432: bcm283x-VEC.patch
 # http://www.spinics.net/lists/dri-devel/msg132235.html
 Patch433: drm-vc4-Fix-OOPSes-from-trying-to-cache-a-partially-constructed-BO..patch
 
+# Fix RPi3 from crashing. Nowhere near a final fix but provides breathing room while that is sorted
+# https://github.com/anholt/linux/issues/89
+Patch434: 0001-i2c-bcm2835-Debug-test-for-curr_msg.patch
+
 # http://www.spinics.net/lists/arm-kernel/msg552554.html
 Patch438: arm-imx6-hummingboard2.patch
 
@@ -2196,8 +2200,15 @@ fi
 #
 #
 %changelog
+* Fri Feb 17 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc8.git2.1
+- Linux v4.10-rc8-62-g6dc39c5
+
+* Thu Feb 16 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc8.git1.1
+- Linux v4.10-rc8-39-g5a81e6a
+
 * Wed Feb 15 2017 Peter Robinson <pbrobinson@fedoraproject.org>
 - Enable PWRSEQ_SIMPLE module (fixes rhbz 1377816)
+- Add patch to work around crash on RPi3
 
 * Tue Feb 14 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc8.git0.2
 - Reenable debugging options.
diff --git a/sources b/sources
index 59f1859c3..d6838cd6b 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-rc8.xz) = c89a8d13ba1fc265b3a08ee229fe2dace5af00034da430830c1f6fe75db46a0c849487c1a41bd4175cf08dc429a780e64a5cce9af10af45b3a788379e77d1b7d
+SHA512 (patch-4.10-rc8-git2.xz) = 77c988b799c055257dd988e0ed284492658f6c03669f4c0302c5f45975571b6633b88570a0ca29925e9eab5f0c8e2e49d2e750ed9cd34853756f5cb88bc94d51