Merge remote-tracking branch 'origin/master'kernel-4.13.0-0.rc7.git2.1.vanilla.knurd.1.fc28kernel-4.13.0-0.rc7.git2.1.vanilla.knurd.1.fc27kernel-4.13.0-0.rc7.git2.1.vanilla.knurd.1.fc26kernel-4.13.0-0.rc7.git2.1.vanilla.knurd.1.fc25

4 files changed, 57 insertions, 3 deletions

diff --git a/gitrev b/gitrev
index 12b965a7f..298ebc065 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-9c3a815f471a84811cf8021cf64aae3b8081dfde
+36fde05f3fb51edea879636db590d70e11f16c82
diff --git a/kernel.spec b/kernel.spec
index 5e7fff3c7..b58e08aef 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 7
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -632,6 +632,9 @@ Patch312: qcom-display-iommu.patch
 # https://patchwork.kernel.org/patch/9839803/
 Patch313: qcom-Force-host-mode-for-USB-on-apq8016-sbc.patch
 
+# https://patchwork.kernel.org/patch/9850189/
+Patch314: qcom-msm-ci_hdrc_msm_probe-missing-of_node_get.patch
+
 # http://www.spinics.net/lists/dri-devel/msg132235.html
 Patch320: bcm283x-vc4-Fix-OOPSes-from-trying-to-cache-a-partially-constructed-BO..patch
 
@@ -2226,6 +2229,12 @@ fi
 #
 #
 %changelog
+* Wed Aug 30 2017 Peter Robinson <pbrobinson@fedoraproject.org>
+- Fix for QCom Dragonboard USB
+
+* Wed Aug 30 2017 Laura Abbott <labbott@redhat.com> - 4.13.0-0.rc7.git2.1
+- Linux v4.13-rc7-15-g36fde05f3fb5
+
 * Tue Aug 29 2017 Laura Abbott <labbott@redhat.com> - 4.13.0-0.rc7.git1.1
 - Linux v4.13-rc7-7-g9c3a815f471a
 
diff --git a/qcom-msm-ci_hdrc_msm_probe-missing-of_node_get.patch b/qcom-msm-ci_hdrc_msm_probe-missing-of_node_get.patch
new file mode 100644
index 000000000..bc1884782
--- /dev/null
+++ b/qcom-msm-ci_hdrc_msm_probe-missing-of_node_get.patch
@@ -0,0 +1,45 @@
+From patchwork Tue Jul 18 23:31:28 2017
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: usb: chipidea: msm: ci_hdrc_msm_probe() missing of_node_get()
+From: Frank Rowand <frowand.list@gmail.com>
+X-Patchwork-Id: 9850189
+Message-Id: <1500420688-11912-1-git-send-email-frowand.list@gmail.com>
+To: Peter Chen <Peter.Chen@nxp.com>,
+ Greg Kroah-Hartman <gregkh@linuxfoundation.org>, linux-usb@vger.kernel.org
+Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org
+Date: Tue, 18 Jul 2017 16:31:28 -0700
+
+From: Frank Rowand <frank.rowand@sony.com>
+
+Boot fails for qcom-apq8074-dragonboard on 4.13-rc1 with error:
+OF: ERROR: Bad of_node_put() on /soc/usb@f9a55000
+
+The error will occur if the configuration is set to:
+   CONFIG_OF_OVERLAY y
+   CONFIG_OF_UNITTEST y
+   CONFIG_OF_DYNAMIC y
+   CONFIG_OF_RESOLVE y
+
+If CONFIG_OF_DYNAMIC is enabled then of_node_release() detects an
+attempt to release a node that is still attached to the device tree.
+
+Signed-off-by: Frank Rowand <frank.rowand@sony.com>
+---
+ drivers/usb/chipidea/ci_hdrc_msm.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c
+index 0bdfcdcbf7a5..bb626120296f 100644
+--- a/drivers/usb/chipidea/ci_hdrc_msm.c
++++ b/drivers/usb/chipidea/ci_hdrc_msm.c
+@@ -251,7 +251,7 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev)
+ 	if (ret)
+ 		goto err_mux;
+ 
+-	ulpi_node = of_find_node_by_name(pdev->dev.of_node, "ulpi");
++	ulpi_node = of_find_node_by_name(of_node_get(pdev->dev.of_node), "ulpi");
+ 	if (ulpi_node) {
+ 		phy_node = of_get_next_available_child(ulpi_node, NULL);
+ 		ci->hsic = of_device_is_compatible(phy_node, "qcom,usb-hsic-phy");
diff --git a/sources b/sources
index 1473d555a..36037a277 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (perf-man-4.12.tar.gz) = 4d3bbda1f520dba0007c351af46f45085fe4842074eb2e01aee736fd369df595f8f72ed6c1192715f1120bf3353279777f9dca1178fe93bffe5be2de700d409c
 SHA512 (linux-4.12.tar.xz) = 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728
 SHA512 (patch-4.13-rc7.xz) = 6e4d86d7342d2f89c694d39ca5254f03dcdea239492753febff5a15bd7475ebfbb29461727f46c7df5f24edd5da25b9da91eb4d3a6250f83bf9876a8c1e36aa1
-SHA512 (patch-4.13-rc7-git1.xz) = a3e98e5d76f223204138d62850e80fd089f660d5a07ed243b448a47c9a0a29111ef8f12fc2d935c95767c923e40e698e03bddf2eabd438932419010935149158
+SHA512 (patch-4.13-rc7-git2.xz) = b1fdcb7dc52bcea32324c9aab800042bf069d089d6d8719f7a0725d82897a23fe582ac4a0740c4dbd7ad3cfd68954fecc299f34b97c265e46ce8ed8a08be5d6c