Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.15.0-0.rc9.git3.1.vanilla.knurd.1.fc27

6 files changed, 57 insertions, 12 deletions

diff --git a/arm-dts-imx6qdl-udoo-Disable-usbh1-to-avoid-kernel-hang.patch b/arm-dts-imx6qdl-udoo-Disable-usbh1-to-avoid-kernel-hang.patch
new file mode 100644
index 000000000..1100a148a
--- /dev/null
+++ b/arm-dts-imx6qdl-udoo-Disable-usbh1-to-avoid-kernel-hang.patch
@@ -0,0 +1,41 @@
+From patchwork Thu Jan 18 12:34:18 2018
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: ARM: dts: imx6qdl-udoo: Disable usbh1 to avoid kernel hang
+From: Fabio Estevam <fabio.estevam@nxp.com>
+X-Patchwork-Id: 10173115
+Message-Id: <1516278858-15464-1-git-send-email-fabio.estevam@nxp.com>
+To: <shawnguo@kernel.org>
+Cc: maggu2810@gmail.com, peter.chen@nxp.com, mail@maciej.szmigiero.name,
+ Fabio Estevam <fabio.estevam@nxp.com>, linux-arm-kernel@lists.infradead.org
+Date: Thu, 18 Jan 2018 10:34:18 -0200
+
+Currently the kernel hangs when USB Host1 is enabled due to the lack of
+support for controlling the USB hub clock and GPIO reset line.
+
+Peter Chen has made several attempts to fix this problem, but his series
+has not been applied yet, so better disable USB host1 for now to avoid
+the kernel hang.
+
+Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
+Acked-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
+Tested-by: Markus Rathgeb <maggu2810@gmail.com>
+---
+ arch/arm/boot/dts/imx6qdl-udoo.dtsi | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/dts/imx6qdl-udoo.dtsi b/arch/arm/boot/dts/imx6qdl-udoo.dtsi
+index 4161b7d..1f0b9f6 100644
+--- a/arch/arm/boot/dts/imx6qdl-udoo.dtsi
++++ b/arch/arm/boot/dts/imx6qdl-udoo.dtsi
+@@ -274,7 +274,8 @@
+ 	pinctrl-0 = <&pinctrl_usbh>;
+ 	vbus-supply = <&reg_usb_h1_vbus>;
+ 	clocks = <&clks IMX6QDL_CLK_CKO>;
+-	status = "okay";
++	/* currently USB support causes a kernel hang. Disable it for now */
++	status = "disabled";
+ };
+ 
+ &usdhc3 {
diff --git a/configs/fedora/generic/CONFIG_DEBUG_VM_RB revisit this if performance isn't horrible b/configs/fedora/generic/CONFIG_DEBUG_VM_RB revisit this if performance isn't horrible
deleted file mode 100644
index fbc8aaef8..000000000
--- a/configs/fedora/generic/CONFIG_DEBUG_VM_RB revisit this if performance isn't horrible
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DEBUG_VM_RB is not set # revisit this if performance isn't horrible
diff --git a/configs/fedora/generic/CONFIG_DPM_WATCHDOG revisit this in debug b/configs/fedora/generic/CONFIG_DPM_WATCHDOG
index c12b35c43..c12b35c43 100644
--- a/configs/fedora/generic/CONFIG_DPM_WATCHDOG revisit this in debug
+++ b/configs/fedora/generic/CONFIG_DPM_WATCHDOG
diff --git a/gitrev b/gitrev
index 89dcd649c..0c15791bc 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-1f07476ec143bbed7bf0b641749783b1094b4c4f
+5b7d27967dabfb17c21b0d98b29153b9e3ee71e5
diff --git a/kernel.spec b/kernel.spec
index 691011010..17b5e1b7f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 9
 # The git snapshot level
-%define gitrev 2
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -584,6 +584,7 @@ Patch210: disable-i8042-check-on-apple-mac.patch
 Patch211: drm-i915-hush-check-crtc-state.patch
 
 # 300 - ARM patches
+Patch300: arm64-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch
 
 # http://www.spinics.net/lists/linux-tegra/msg26029.html
 Patch301: usb-phy-tegra-Add-38.4MHz-clock-table-entry.patch
@@ -595,23 +596,24 @@ Patch302: arm-revert-mmc-omap_hsmmc-Use-dma_request_chan-for-reque.patch
 Patch303: ARM-tegra-usb-no-reset.patch
 
 # https://www.spinics.net/lists/arm-kernel/msg554183.html
-Patch305: arm-imx6-hummingboard2.patch
+Patch304: arm-imx6-hummingboard2.patch
 
-Patch306: arm64-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch
-
-Patch307: arm64-Revert-allwinner-a64-pine64-Use-dcdc1-regulato.patch
+Patch305: arm64-Revert-allwinner-a64-pine64-Use-dcdc1-regulato.patch
 
 # https://patchwork.kernel.org/patch/9820417/
-Patch310: qcom-msm89xx-fixes.patch
+Patch306: qcom-msm89xx-fixes.patch
+
+# https://patchwork.kernel.org/patch/10173115/
+Patch307: arm-dts-imx6qdl-udoo-Disable-usbh1-to-avoid-kernel-hang.patch
 
 # Fix USB on the RPi https://patchwork.kernel.org/patch/9879371/
-Patch321: bcm283x-dma-mapping-skip-USB-devices-when-configuring-DMA-during-probe.patch
+Patch308: bcm283x-dma-mapping-skip-USB-devices-when-configuring-DMA-during-probe.patch
 
 # https://git.kernel.org/pub/scm/linux/kernel/git/ardb/linux.git/log/?h=synquacer-netsec
-Patch332: arm64-socionext-96b-enablement.patch
+Patch330: arm64-socionext-96b-enablement.patch
 
 # https://patchwork.kernel.org/patch/10149775/ MMC support for Synquacer
-Patch333: arm64-mmc-sdhci_f_sdh30-add-ACPI-support.patch
+Patch331: arm64-mmc-sdhci_f_sdh30-add-ACPI-support.patch
 
 # 400 - IBM (ppc/s390x) patches
 
@@ -1919,6 +1921,9 @@ fi
 #
 #
 %changelog
+* Thu Jan 25 2018 Laura Abbott <labbott@redhat.com> - 4.15.0-0.rc9.git3.1
+- Linux v4.15-rc9-55-g5b7d27967dab
+
 * Wed Jan 24 2018 Laura Abbott <labbott@redhat.com> - 4.15.0-0.rc9.git2.1
 - Linux v4.15-rc9-23-g1f07476ec143
 
diff --git a/sources b/sources
index 9a5f30775..0607c02e6 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (linux-4.14.tar.xz) = 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 SHA512 (perf-man-4.14.tar.gz) = 76a9d8adc284cdffd4b3fbb060e7f9a14109267707ce1d03f4c3239cd70d8d164f697da3a0f90a363fbcac42a61d3c378afbcc2a86f112c501b9cb5ce74ef9f8
 SHA512 (patch-4.15-rc9.xz) = 1b26350365d680bfa2bd5b38526aed8547e856a84168bdbca6e118b8181a68a2deb5bb5335325a4a2ffe33508eabdb01893bcdc85c90314746e8d399aac33be0
-SHA512 (patch-4.15-rc9-git2.xz) = d24cf1818616dc7c3c4268253a4dc4ef791f03171dcdfd9c0e10652e9472c0f4ee1fdf4c9c4c92005b71abb35e138df1c5f2791f7290e46d4f4cde2c1cfef6f0
+SHA512 (patch-4.15-rc9-git3.xz) = 2730959d8348c9022579fa0157f9cbc83f22d26c81e2ec7224fed3ec92f37a8c34a5b6df319766921c32b86935a9ae434a75bb8ae2605fd67eff873357856bbd