Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.2.0-0.rc5.git4.1.vanilla.knurd.1.fc31kernel-5.2.0-0.rc5.git4.1.vanilla.knurd.1.fc30kernel-5.2.0-0.rc5.git4.1.vanilla.knurd.1.fc29

3 files changed, 9 insertions, 3 deletions

diff --git a/gitrev b/gitrev
index 83ea86a1b..5aae85786 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-241e39004581475b2802cd63c111fec43bb0123e
+4ae004a9bca8bef118c2b4e76ee31c7df4514f18
diff --git a/kernel.spec b/kernel.spec
index 3593466bf..d63d30a3d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -22,6 +22,8 @@ Summary: The Linux kernel
 
 %if %{zipmodules}
 %global zipsed -e 's/\.ko$/\.ko.xz/'
+# for parallel xz processes, replace with 1 to go back to single process
+%global zcpu `nproc --all`
 %endif
 
 # define buildid .local
@@ -77,7 +79,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 5
 # The git snapshot level
-%define gitrev 3
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 5.%{upstream_sublevel}.0
 %endif
@@ -1579,7 +1581,7 @@ BuildKernel %make_target %kernel_image %{_use_vdso}
     fi \
   fi \
   if [ "%{zipmodules}" -eq "1" ]; then \
-    find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs xz; \
+    find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P%{zcpu} xz; \
   fi \
 %{nil}
 
@@ -1844,6 +1846,9 @@ fi
 #
 #
 %changelog
+* Fri Jun 21 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.2.0-0.rc5.git4.1
+- Linux v5.2-rc5-290-g4ae004a9bca8
+
 * Thu Jun 20 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.2.0-0.rc5.git3.1
 - Linux v5.2-rc5-239-g241e39004581
 
diff --git a/sources b/sources
index 2620ac9fc..2df9ef290 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 SHA512 (linux-5.1.tar.xz) = ae96f347badc95f1f3acf506c52b6cc23c0bd09ce8f4ce6705d4b4058b62593059bba1bc603c8d8b00a2f19131e7e56c31ac62b45883a346fa61d655e178f236
 SHA512 (patch-5.2-rc5.xz) = ee7caea50dccd299182da1453ca2a6f3f4947d544da81703e00b7f63e7c99d19975d4a34261282bbce36a8cf08060a60e51c095189a3aa43fdc34b67b05004c7
 SHA512 (patch-5.2-rc5-git3.xz) = 4fd8ac2caeb6e281ba9694a068c168486dba9e77b0b3b19fb6c8b4067e5ca0a878d9270c26ddcd82cceed5e7f3d7050ddec0e98b0fe0177ba9f7f5703349c76f
+SHA512 (patch-5.2-rc5-git4.xz) = 39411def747b14e670a71f83ac822ec7721dfe68a87e976882c0e2419c10d783b7b862010a7c273ba6631b43714a865dcd98d1b9886fecd7e935dc3aa0c1b136