Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.5.0-0.rc7.git2.1.vanilla.knurd.1.fc31kernel-5.5.0-0.rc7.git2.1.vanilla.knurd.1.fc30

6 files changed, 12 insertions, 3 deletions

diff --git a/configs/fedora/generic/powerpc/CONFIG_DEVICE_PRIVATE b/configs/fedora/generic/powerpc/CONFIG_DEVICE_PRIVATE
new file mode 100644
index 000000000..ef0a4ad5b
--- /dev/null
+++ b/configs/fedora/generic/powerpc/CONFIG_DEVICE_PRIVATE
@@ -0,0 +1 @@
+CONFIG_DEVICE_PRIVATE=y
diff --git a/gitrev b/gitrev
index 26117a284..ab6a5775f 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-131701c697e85d5d0726e6152219359639fae98f
+6381b442836ea3c52eae630b10be8c27c7a17af2
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 592f9f1a4..9fdfa0093 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -1063,6 +1063,7 @@ CONFIG_DEV_DAX_PMEM=m
 CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
 # CONFIG_DEVFREQ_GOV_USERSPACE is not set
 # CONFIG_DEVFREQ_THERMAL is not set
+CONFIG_DEVICE_PRIVATE=y
 # CONFIG_DEVKMEM is not set
 CONFIG_DEVMEM=y
 CONFIG_DEVPORT=y
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index d18a82efe..0e47b86c3 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -1055,6 +1055,7 @@ CONFIG_DEV_DAX_PMEM=m
 CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
 # CONFIG_DEVFREQ_GOV_USERSPACE is not set
 # CONFIG_DEVFREQ_THERMAL is not set
+CONFIG_DEVICE_PRIVATE=y
 # CONFIG_DEVKMEM is not set
 CONFIG_DEVMEM=y
 CONFIG_DEVPORT=y
diff --git a/kernel.spec b/kernel.spec
index 0db1cb720..d7affaf55 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1,6 +1,9 @@
 # We have to override the new %%install behavior because, well... the kernel is special.
 %global __spec_install_pre %{___build_pre}
 
+# this should go away soon
+%define _legacy_common_support 1
+
 # At the time of this writing (2019-03), RHEL8 packages use w2.xzdio
 # compression for rpms (xz, level 2).
 # Kernel has several large (hundreds of mbytes) rpms, they take ~5 mins
@@ -112,7 +115,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 5.%{upstream_sublevel}.0
 %endif
@@ -2910,6 +2913,9 @@ fi
 #
 #
 %changelog
+* Fri Jan 24 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.0-0.rc7.git2.1
+- Linux v5.5-rc7-62-g6381b442836e
+
 * Thu Jan 23 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.0-0.rc7.git1.1
 - Linux v5.5-rc7-16-g131701c697e8
 
diff --git a/sources b/sources
index 7c5531336..e533c7030 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (linux-5.4.tar.xz) = 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 SHA512 (patch-5.5-rc7.xz) = 201e1da9acb0a9dfea4aa2eda89453c390f2aec7fe5ebcc9a46ef6a44dc16aacc7eb75aada461fbf12102014eb8767c6a640ac2dcc441e9803a4942c0b83c5e8
-SHA512 (patch-5.5-rc7-git1.xz) = 575e443797c110072536b692617ee08b86c5dbde00b448bbd3d8199a0ec240296235b612c2bc780cd9dac4a69128f4a14d2e0c36efe91f96b43b583d9ff498e8
+SHA512 (patch-5.5-rc7-git2.xz) = cf955e531c340c25bb8a52a80b299703e9645c039d1fa46968a41e8d90f7f165c949baf4021d2cd32a6c3c321c974b68d94b0d476b18db9ca7f6274b9982ddba