summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--0001-Drop-that-for-now.patch2
-rw-r--r--0001-put-RHEL-info-into-generated-headers.patch2
-rw-r--r--kernel.spec24
-rw-r--r--sources6
4 files changed, 23 insertions, 11 deletions
diff --git a/0001-Drop-that-for-now.patch b/0001-Drop-that-for-now.patch
index 233c6ddad..8f7f56e04 100644
--- a/0001-Drop-that-for-now.patch
+++ b/0001-Drop-that-for-now.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] Drop that for now
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index 09639e0e075f..8c072a1954cb 100644
+index 542284743304..18036f3c183f 100644
--- a/Makefile
+++ b/Makefile
@@ -496,7 +496,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE
diff --git a/0001-put-RHEL-info-into-generated-headers.patch b/0001-put-RHEL-info-into-generated-headers.patch
index d1a9195bd..7e282eafa 100644
--- a/0001-put-RHEL-info-into-generated-headers.patch
+++ b/0001-put-RHEL-info-into-generated-headers.patch
@@ -59,7 +59,7 @@ Acked-by: Prarit Bhargava <prarit@redhat.com>
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index 0b5f8538bde5..09639e0e075f 100644
+index 249a51d25c63..542284743304 100644
--- a/Makefile
+++ b/Makefile
@@ -1217,7 +1217,13 @@ endef
diff --git a/kernel.spec b/kernel.spec
index 0fffd3700..ddfe18e7a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -30,7 +30,7 @@ Summary: The Linux kernel
# For a stable, released kernel, released_kernel should be 1.
%global released_kernel 0
-%global distro_build 0.rc5.20200717git07a56bb875af.1
+%global distro_build 0.rc6.20200720git5714ee50bb43.1
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -71,13 +71,13 @@ Summary: The Linux kernel
%endif
%define rpmversion 5.8.0
-%define pkgrelease 0.rc5.20200717git07a56bb875af.1
+%define pkgrelease 0.rc6.20200720git5714ee50bb43.1
# This is needed to do merge window version magic
%define patchlevel 8
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc5.20200717git07a56bb875af.1%{?buildid}%{?dist}
+%define specrelease 0.rc6.20200720git5714ee50bb43.1%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -569,7 +569,7 @@ BuildRequires: asciidoc
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-20200717git07a56bb875af.tar.xz
+Source0: linux-20200720git5714ee50bb43.tar.xz
Source1: Makefile.rhelver
@@ -1310,8 +1310,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-20200717git07a56bb875af -c
-mv linux-20200717git07a56bb875af linux-%{KVERREL}
+%setup -q -n kernel-20200720git5714ee50bb43 -c
+mv linux-20200720git5714ee50bb43 linux-%{KVERREL}
cd linux-%{KVERREL}
# cp -a %{SOURCE1} .
@@ -2848,6 +2848,18 @@ fi
#
#
%changelog
+* Mon Jul 20 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc6.20200720git5714ee50bb43.1]
+- 5714ee50bb43 rebase
+- Updated changelog for the release based on f932d58abc38 (Fedora Kernel Team)
+
+* Sun Jul 19 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc5.20200719gitf932d58abc38.1]
+- f932d58abc38 rebase
+- Updated changelog for the release based on 6a70f89cc58f (Fedora Kernel Team)
+
+* Sat Jul 18 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc5.20200718git6a70f89cc58f.1]
+- 6a70f89cc58f rebase
+- Updated changelog for the release based on 07a56bb875af (Fedora Kernel Team)
+
* Fri Jul 17 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc5.20200717git07a56bb875af.1]
- 07a56bb875af rebase
- redhat/configs: Fix common CONFIGs (Prarit Bhargava)
diff --git a/sources b/sources
index 5100a3129..390088699 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-20200717git07a56bb875af.tar.xz) = da8e5cc6515e6fdd66acee550bc3e552af9dbc190f1193733c1f4dc77ff2d9fe77ed9652d7f44418ebea0f7635a8b64a6e042d5d98384701f5f91493f006980b
-SHA512 (kernel-abi-whitelists-5.8.0-0.rc5.20200717git07a56bb875af.1.tar.bz2) = 6bced500b7240924cb8beb9ed9c321980f448dd06aa37d1392f3b6cafca41a898d1b0c7fae30824fb58521783bdc0b6e007a686ec3b721d4e3548e606089615f
-SHA512 (kernel-kabi-dw-5.8.0-0.rc5.20200717git07a56bb875af.1.tar.bz2) = c56a5f3184002cda31ec2e9930ac26561d0943156555db71fa23ceca0d8a680deb758a89660007c5c40775ce87e500a0dd9f7f0bdab8b1dc2740fef97bd863b4
+SHA512 (linux-20200720git5714ee50bb43.tar.xz) = c6741413afab4a542312bef80e37c2c69d64414bb9d11e2ca57291fe257b397b7aa0fd1414c8d91227ece61d15db179bd0993e4d7a55b5263bc1e094b760ba22
+SHA512 (kernel-abi-whitelists-5.8.0-0.rc6.20200720git5714ee50bb43.1.tar.bz2) = a7d5ec1cb81a4a2fd9251703b31a3e33407229a7ade1daea6f6f401fdaf55d796c4bccdc9a7456384d0898545f8ce9b509bd7dc0321dd6ee6cbfbcceeb1a067f
+SHA512 (kernel-kabi-dw-5.8.0-0.rc6.20200720git5714ee50bb43.1.tar.bz2) = bfa8b6329b7415ec59614604abbbdb0ce631b579c6c0f3972d223cb4f8877fb34efd541a5dadae11d7bb1bf85b2de9abc903db980308a529eec58a4d8665e5b2