Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.10.0-0.rc4.20201117git9c87c9f41245.79.vanilla.1.fc32

3 files changed, 15 insertions, 12 deletions

diff --git a/Makefile.rhelver b/Makefile.rhelver
index 186329230..d82358ca5 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 99
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 78
+RHEL_RELEASE = 79
 
 #
 # Early y+1 numbering
diff --git a/kernel.spec b/kernel.spec
index f83d5b061..f27a7b455 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -56,7 +56,7 @@ Summary: The Linux kernel
 # For a stable, released kernel, released_kernel should be 1.
 %global released_kernel 0
 
-%global distro_build 0.rc4.78
+%global distro_build 0.rc4.20201117git9c87c9f41245.79
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -97,13 +97,13 @@ Summary: The Linux kernel
 %endif
 
 %define rpmversion 5.10.0
-%define pkgrelease 0.rc4.78
+%define pkgrelease 0.rc4.20201117git9c87c9f41245.79
 
 # This is needed to do merge window version magic
 %define patchlevel 10
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc4.78%{?buildid}%{?dist}
+%define specrelease 0.rc4.20201117git9c87c9f41245.79%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -193,7 +193,7 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
 
 # The kernel tarball/base version
 %define kversion 5.10
@@ -594,7 +594,7 @@ BuildRequires: asciidoc
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.10-rc4.tar.xz
+Source0: linux-20201117git9c87c9f41245.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1238,8 +1238,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.10-rc4 -c
-mv linux-5.10-rc4 linux-%{KVERREL}
+%setup -q -n kernel-20201117git9c87c9f41245 -c
+mv linux-20201117git9c87c9f41245 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 # cp -a %{SOURCE1} .
@@ -2681,9 +2681,12 @@ fi
 #
 #
 %changelog
-* Mon Nov 16 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc4.77]
+* Tue Nov 17 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc4.20201117git9c87c9f41245.78]
 - No need to review, Temporary workarounds due to DEBUG_INFO_BTF not working ("Justin M. Forbes")
 
+* Tue Nov 17 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc4.20201117git9c87c9f41245.77.test]
+- 9c87c9f41245 rebase
+
 * Mon Nov 16 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc4.76.test]
 - v5.10-rc4 rebase
 - Ath11k related config updates ("Justin M. Forbes")
diff --git a/sources b/sources
index 25dcd7305..5ae730aff 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.10-rc4.tar.xz) = 8baa896f2e327805422e95e516e1aa517cdd0351c68a575b9a862b6b06942eeb69566abc32fe39b916af04d9b59525af21f5c8d66b6ff574a689727027993cf1
-SHA512 (kernel-abi-whitelists-5.10.0-0.rc4.78.tar.bz2) = 340eb6a5013cad7f016db7e2bc68bb309de4ae06a8ea07d7d88efd73f644f1f2a3eb74f6f7f726fda57eb5fc1e2bf78d4a0eac3aed6dd5450943c1c64a59b1c9
-SHA512 (kernel-kabi-dw-5.10.0-0.rc4.78.tar.bz2) = 0872faaa1d4f67664630b63d66adcc9b4384026e3bda53e3ab0f7873a09d0e3b50ded8b28ce062ecdf789c9d0a5d9c46bd5bede09b3aaaa4db62c019556003fe
+SHA512 (linux-20201117git9c87c9f41245.tar.xz) = 239d125bacb0dce3f209858e961dcda65a06ae90487ff7ec3cfcff9c39acf5842ca86d5abd2e618f1ee1a78436d9c1f510003da0d76a100e7519b82df309021c
+SHA512 (kernel-abi-whitelists-5.10.0-0.rc4.20201117git9c87c9f41245.79.tar.bz2) = d063c44dea5aec587235a751f6daa4b053a3f536019cdb900c288dfc551af51e0fd6b46925390b0ccaca17ad848cc4885ec357ae94538a2d7505572c37117fa4
+SHA512 (kernel-kabi-dw-5.10.0-0.rc4.20201117git9c87c9f41245.79.tar.bz2) = 8276fe66822069224e8b1a7d1193833756d7d2535a5785581e010af856d915777189f25d051b820f131771e3d96c410a462d1bdcbd4c79e406c8c4e58d46dd31