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

3 files changed, 12 insertions, 5 deletions

diff --git a/gitrev b/gitrev
index cb12f1347..013c6e3da 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-c15f6d8d47152762a2819173599ce0eb135297f1
+625e2001e99e82ea3eb5b0370a428a4328b9166b
diff --git a/kernel.spec b/kernel.spec
index 602ae4e1b..dc708c00d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 3
 # The git snapshot level
-%define gitrev 3
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -1368,6 +1368,9 @@ BuildKernel() {
     if [ -f arch/$Arch/*lds ]; then
       cp -a arch/$Arch/*lds $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch}/ || :
     fi
+    if [ -f arch/%{asmarch}/kernel/module.lds ]; then
+      cp -a --parents arch/%{asmarch}/kernel/module.lds $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
+    fi
     rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*.o
     rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*/*.o
 %ifarch %{power64}
@@ -1377,8 +1380,6 @@ BuildKernel() {
       cp -a --parents arch/%{asmarch}/include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
     fi
 %ifarch aarch64
-    # Needed for systemtap
-    cp -a --parents arch/arm64/kernel/module.lds $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
     # arch/arm64/include/asm/xen references arch/arm
     cp -a --parents arch/arm/include/asm/xen $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
     # arch/arm64/include/asm/opcodes.h references arch/arm
@@ -1889,6 +1890,12 @@ fi
 #
 #
 %changelog
+* Fri May 04 2018 Laura Abbott <labbott@redhat.com>
+- Fix for building out of tree modules on powerpc (rhbz 1574604)
+
+* Fri May 04 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc3.git4.1
+- Linux v4.17-rc3-148-g625e2001e99e
+
 * Thu May 03 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc3.git3.1
 - Linux v4.17-rc3-36-gc15f6d8d4715
 
diff --git a/sources b/sources
index 52a71bb80..caf628147 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (linux-4.16.tar.xz) = ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662
 SHA512 (patch-4.17-rc3.xz) = 5b8a72386f295628e5ebdccbfb25caea60237233496d3c98769942f40c83e7339f35b51b084e75cc8ced15d26b5194345ea9c38f724b138aae2cf498924bd3e7
-SHA512 (patch-4.17-rc3-git3.xz) = a69a181373777e4bf5bcb0ad1625404031380898ff93d3bcb706cb9036d73666fff437091903f38619f9557fdb8698801ce4df5e4fdf06f2b91ff3c2ffa9cb89
+SHA512 (patch-4.17-rc3-git4.xz) = ad606ba5adc5996f0deda09f86242f6be59201b8ebd34046c11b50f972aa5253de7597039143a994c4a93889a22940d96a40170ca2028e177f47f8438707a1c4