Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.17.0-0.rc4.git4.1.vanilla.knurd.1.fc29kernel-4.17.0-0.rc4.git4.1.vanilla.knurd.1.fc28kernel-4.17.0-0.rc4.git4.1.vanilla.knurd.1.fc27kernel-4.17.0-0.rc4.git4.1.vanilla.knurd.1.fc26

4 files changed, 94 insertions, 17 deletions

diff --git a/arm64-dts-marvell-armada-cp110-fix-hang.patch b/arm64-dts-marvell-armada-cp110-fix-hang.patch
new file mode 100644
index 000000000..3f55cd90d
--- /dev/null
+++ b/arm64-dts-marvell-armada-cp110-fix-hang.patch
@@ -0,0 +1,70 @@
+From f43194c1447c9536efb0859c2f3f46f6bf2b9154 Mon Sep 17 00:00:00 2001
+From: Maxime Chevallier <maxime.chevallier@bootlin.com>
+Date: Wed, 25 Apr 2018 20:19:47 +0200
+Subject: ARM64: dts: marvell: armada-cp110: Add mg_core_clk for ethernet node
+
+Marvell PPv2.2 controller present on CP-110 need the extra "mg_core_clk"
+clock to avoid system hangs when powering some network interfaces up.
+
+This issue appeared after a recent clock rework on Armada 7K/8K platforms.
+
+This commit adds the new clock and updates the documentation accordingly.
+
+[gregory.clement: use the real first commit to fix and add the cc:stable
+flag]
+Fixes: e3af9f7c6ece ("RM64: dts: marvell: armada-cp110: Fix clock resources for various node")
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
+Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
+---
+ Documentation/devicetree/bindings/net/marvell-pp2.txt | 9 +++++----
+ arch/arm64/boot/dts/marvell/armada-cp110.dtsi         | 5 +++--
+ 2 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/Documentation/devicetree/bindings/net/marvell-pp2.txt b/Documentation/devicetree/bindings/net/marvell-pp2.txt
+index 1814fa1..fc019df 100644
+--- a/Documentation/devicetree/bindings/net/marvell-pp2.txt
++++ b/Documentation/devicetree/bindings/net/marvell-pp2.txt
+@@ -21,9 +21,10 @@ Required properties:
+ 	- main controller clock (for both armada-375-pp2 and armada-7k-pp2)
+ 	- GOP clock (for both armada-375-pp2 and armada-7k-pp2)
+ 	- MG clock (only for armada-7k-pp2)
++	- MG Core clock (only for armada-7k-pp2)
+ 	- AXI clock (only for armada-7k-pp2)
+-- clock-names: names of used clocks, must be "pp_clk", "gop_clk", "mg_clk"
+-  and "axi_clk" (the 2 latter only for armada-7k-pp2).
++- clock-names: names of used clocks, must be "pp_clk", "gop_clk", "mg_clk",
++  "mg_core_clk" and "axi_clk" (the 3 latter only for armada-7k-pp2).
+ 
+ The ethernet ports are represented by subnodes. At least one port is
+ required.
+@@ -80,8 +81,8 @@ cpm_ethernet: ethernet@0 {
+ 	compatible = "marvell,armada-7k-pp22";
+ 	reg = <0x0 0x100000>, <0x129000 0xb000>;
+ 	clocks = <&cpm_syscon0 1 3>, <&cpm_syscon0 1 9>,
+-		 <&cpm_syscon0 1 5>, <&cpm_syscon0 1 18>;
+-	clock-names = "pp_clk", "gop_clk", "gp_clk", "axi_clk";
++		 <&cpm_syscon0 1 5>, <&cpm_syscon0 1 6>, <&cpm_syscon0 1 18>;
++	clock-names = "pp_clk", "gop_clk", "mg_clk", "mg_core_clk", "axi_clk";
+ 
+ 	eth0: eth0 {
+ 		interrupts = <ICU_GRP_NSR 39 IRQ_TYPE_LEVEL_HIGH>,
+diff --git a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
+index ca22f9d..ed2f123 100644
+--- a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
++++ b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
+@@ -38,9 +38,10 @@
+ 			compatible = "marvell,armada-7k-pp22";
+ 			reg = <0x0 0x100000>, <0x129000 0xb000>;
+ 			clocks = <&CP110_LABEL(clk) 1 3>, <&CP110_LABEL(clk) 1 9>,
+-				 <&CP110_LABEL(clk) 1 5>, <&CP110_LABEL(clk) 1 18>;
++				 <&CP110_LABEL(clk) 1 5>, <&CP110_LABEL(clk) 1 6>,
++				 <&CP110_LABEL(clk) 1 18>;
+ 			clock-names = "pp_clk", "gop_clk",
+-				      "mg_clk", "axi_clk";
++				      "mg_clk", "mg_core_clk", "axi_clk";
+ 			marvell,system-controller = <&CP110_LABEL(syscon0)>;
+ 			status = "disabled";
+ 			dma-coherent;
+-- 
+cgit v1.1
diff --git a/gitrev b/gitrev
index 19d80f3b5..80fa59bc2 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-008464a9360e31b14677457dcd976fbf9dd58e2e
+41e3e1082367221e99a59c8968a583706123ae04
diff --git a/kernel.spec b/kernel.spec
index 2a52a2d74..bcf465711 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 4
 # The git snapshot level
-%define gitrev 3
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -584,41 +584,42 @@ 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
-
 # http://patchwork.ozlabs.org/patch/587554/
 Patch302: ARM-tegra-usb-no-reset.patch
 
+# https://patchwork.kernel.org/patch/10351797/
+Patch303: ACPI-scan-Fix-regression-related-to-X-Gene-UARTs.patch
+# rhbz 1574718
+Patch304: ACPI-irq-Workaround-firmware-issue-on-X-Gene-based-m400.patch
+
 # https://patchwork.kernel.org/patch/9820417/
-Patch303: qcom-msm89xx-fixes.patch
+Patch305: qcom-msm89xx-fixes.patch
 
 # https://patchwork.kernel.org/patch/10173115/
-Patch304: arm-dts-imx6qdl-udoo-Disable-usbh1-to-avoid-kernel-hang.patch
-
-# https://patchwork.kernel.org/patch/10351797/
-Patch305: ACPI-scan-Fix-regression-related-to-X-Gene-UARTs.patch
+Patch306: arm-dts-imx6qdl-udoo-Disable-usbh1-to-avoid-kernel-hang.patch
 
 # https://marc.info/?l=linux-kernel&m=152328880417846&w=2
-Patch308: arm64-thunderx-crypto-zip-fixes.patch
+Patch307: arm64-thunderx-crypto-zip-fixes.patch
 
 # https://www.spinics.net/lists/linux-crypto/msg32725.html
-Patch309: crypto-testmgr-Allow-different-compression-results.patch
+Patch308: crypto-testmgr-Allow-different-compression-results.patch
 
-Patch310: arm-tegra-fix-nouveau-crash.patch
+Patch309: arm-tegra-fix-nouveau-crash.patch
 
 # https://patchwork.kernel.org/patch/10346089/
-Patch311: arm-dts-Add-am335x-pocketbeagle.patch
+Patch310: arm-dts-Add-am335x-pocketbeagle.patch
 
 # https://www.spinics.net/lists/linux-tegra/msg32920.html
-Patch312: arm-tegra-USB-driver-dependency-fix.patch
+Patch311: arm-tegra-USB-driver-dependency-fix.patch
 
-# rhbz 1574718
-Patch313: ACPI-irq-Workaround-firmware-issue-on-X-Gene-based-m400.patch
+# In linux-next, due in stable
+Patch312: arm64-dts-marvell-armada-cp110-fix-hang.patch
 
 # https://patchwork.kernel.org/patch/10354521/
 # https://patchwork.kernel.org/patch/10354187/
 # https://patchwork.kernel.org/patch/10306793/
 # https://patchwork.kernel.org/patch/10133165/
-Patch315: mvebu-a37xx-fixes.patch
+Patch313: mvebu-a37xx-fixes.patch
 
 Patch324: bcm283x-clk-audio-fixes.patch
 
@@ -1895,6 +1896,12 @@ fi
 #
 #
 %changelog
+* Fri May 11 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc4.git4.1
+- Linux v4.17-rc4-96-g41e3e1082367
+
+* Thu May 10 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Add fix from linux-next for mvebu Armada 8K macbin boot regression
+
 * Thu May 10 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc4.git3.1
 - Linux v4.17-rc4-38-g008464a9360e
 
diff --git a/sources b/sources
index db9569743..cb329bbbc 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (linux-4.16.tar.xz) = ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662
 SHA512 (patch-4.17-rc4.xz) = 110990b1cc0ccb500075acec043810434a33beb23c1e020a9c8034e11af1e61d35273a6c3cb80d4f3ae8bb9da3f3909bff3b89c80af13219baf96f70a45513c8
-SHA512 (patch-4.17-rc4-git3.xz) = 2a032b7ee73813f2239a145c09b7407db197600668f6071ca3e747de110ec64fc17cf388304892d2aaf4e04741e2ec9e39fdd960382bedabcba75507ee182549
+SHA512 (patch-4.17-rc4-git4.xz) = 09b16276469ae1afe67a1c45118baf8a71d7f4dfae9eff783373a8dcd27b1dbf3a64fe18c1e6f2b3e5734a6958f476e31f31136341b5c6bee93f1efcc3c92d42