Merge remote-tracking branch 'origin/master'kernel-4.11.0-0.rc8.git4.1.vanilla.knurd.1.fc27kernel-4.11.0-0.rc8.git4.1.vanilla.knurd.1.fc26kernel-4.11.0-0.rc8.git4.1.vanilla.knurd.1.fc25kernel-4.11.0-0.rc8.git4.1.vanilla.knurd.1.fc24

4 files changed, 57 insertions, 3 deletions

diff --git a/gitrev b/gitrev
index 5cb077af6..67b1b7400 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-f83246089ca09308425175d47f5e71e6da68b2ef
+8b5d11e4b095450e2f259d5f60ea18c13d2fe0a2
diff --git a/kernel.spec b/kernel.spec
index 4263c8902..ccb6f60fc 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 8
 # The git snapshot level
-%define gitrev 3
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -571,6 +571,9 @@ Patch437: bcm283x-hdmi-audio.patch
 # https://www.spinics.net/lists/arm-kernel/msg554183.html
 Patch438: arm-imx6-hummingboard2.patch
 
+# https://lkml.org/lkml/2017/4/4/316
+Patch339: media-cec-Fix-runtime-BUG-when-CONFIG_RC_CORE-CEC_CAP_RC.patch
+
 Patch440: arm64-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch
 
 Patch460: lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
@@ -2203,6 +2206,12 @@ fi
 #
 #
 %changelog
+* Fri Apr 28 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc8.git4.1
+- Linux v4.11-rc8-87-g8b5d11e
+
+* Fri Apr 28 2017 Peter Robinson <pbrobinson@fedoraproject.org>
+- Upstream CEC patch to fix STi issues
+
 * Thu Apr 27 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc8.git3.1
 - Linux v4.11-rc8-75-gf832460
 
diff --git a/media-cec-Fix-runtime-BUG-when-CONFIG_RC_CORE-CEC_CAP_RC.patch b/media-cec-Fix-runtime-BUG-when-CONFIG_RC_CORE-CEC_CAP_RC.patch
new file mode 100644
index 000000000..7a29d72bf
--- /dev/null
+++ b/media-cec-Fix-runtime-BUG-when-CONFIG_RC_CORE-CEC_CAP_RC.patch
@@ -0,0 +1,45 @@
+From patchwork Tue Apr  4 12:32:19 2017
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [2/2, media] cec: Fix runtime BUG when (CONFIG_RC_CORE && !CEC_CAP_RC)
+From: Lee Jones <lee.jones@linaro.org>
+X-Patchwork-Id: 9661691
+Message-Id: <20170404123219.22040-2-lee.jones@linaro.org>
+To: hans.verkuil@cisco.com,
+	mchehab@kernel.org
+Cc: benjamin.gaignard@st.com, patrice.chotard@st.com,
+ linux-kernel@vger.kernel.org, kernel@stlinux.com,
+ Lee Jones <lee.jones@linaro.org>, linux-arm-kernel@lists.infradead.org,
+ linux-media@vger.kernel.org
+Date: Tue,  4 Apr 2017 13:32:19 +0100
+
+Currently when the RC Core is enabled (reachable) core code located
+in cec_register_adapter() attempts to populate the RC structure with
+a pointer to the 'parent' passed in by the caller.
+
+Unfortunately if the caller did not specify RC capibility when calling
+cec_allocate_adapter(), then there will be no RC structure to populate.
+
+This causes a "NULL pointer dereference" error.
+
+Fixes: f51e80804f0 ("[media] cec: pass parent device in register(), not allocate()")
+Signed-off-by: Lee Jones <lee.jones@linaro.org>
+---
+ drivers/media/cec/cec-core.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/media/cec/cec-core.c b/drivers/media/cec/cec-core.c
+index 06a312c..d64937b 100644
+--- a/drivers/media/cec/cec-core.c
++++ b/drivers/media/cec/cec-core.c
+@@ -286,8 +286,8 @@ int cec_register_adapter(struct cec_adapter *adap,
+ 	adap->devnode.dev.parent = parent;
+ 
+ #if IS_REACHABLE(CONFIG_RC_CORE)
+-	adap->rc->dev.parent = parent;
+ 	if (adap->capabilities & CEC_CAP_RC) {
++		adap->rc->dev.parent = parent;
+ 		res = rc_register_device(adap->rc);
+ 
+ 		if (res) {
diff --git a/sources b/sources
index 553091988..a57c3d7bd 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (linux-4.10.tar.xz) = c3690125a8402df638095bd98a613fcf1a257b81de7611c84711d315cd11e2634ab4636302b3742aedf1e3ba9ce0fea53fe8c7d48e37865d8ee5db3565220d90
 SHA512 (perf-man-4.10.tar.gz) = 2c830e06f47211d70a8330961487af73a8bc01073019475e6b6131d3bb8c95658b77ca0ae5f1b44371accf103658bc5a3a4366b3e017a4088a8fd408dd6867e8
 SHA512 (patch-4.11-rc8.xz) = 07a3b08ad1ef9323df14f19995bdc261c303a150d58159791697389701f01ade2fdb55937c3c08f362772dd3e1337e466d653de81a9d49ff1015f4482d77c375
-SHA512 (patch-4.11-rc8-git3.xz) = f77af28243745142b32502990e2b32083eb8ca8c2b83bb51c5273e7866d0e3f944b5ec48fdf9f50144acaee5b014d54c70dc4b018c5f5cb2b7bae7aceaddb3f6
+SHA512 (patch-4.11-rc8-git4.xz) = 7d186c95a0090346eaa9f3ee1afe0be54e2091ae1afdf95d98c083e75f90e54276c05c4ec3f75cb47598ed22258bc10c7b60760a9628d7805dd97cd79b9a96d5