summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-11-27 06:21:37 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2021-11-27 06:21:37 +0100
commit1e027f348a83a994bc390f5fc35cf30732926afb (patch)
treee31692332a193f99b11b5d1530d71c693f044f81
parent231073adec9750c341eaff8fef401460fb13fb9a (diff)
parent88e40a46831279b99ec52a1b7aeea59c4db8b84e (diff)
downloadkernel-1e027f348a83a994bc390f5fc35cf30732926afb.tar.gz
kernel-1e027f348a83a994bc390f5fc35cf30732926afb.tar.xz
kernel-1e027f348a83a994bc390f5fc35cf30732926afb.zip
-rw-r--r--Makefile.rhelver2
-rwxr-xr-xkernel.spec12
-rw-r--r--patch-5.16-redhat.patch4
-rw-r--r--sources6
4 files changed, 12 insertions, 12 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 7f02eb68b..f4c251150 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 = 19
+RHEL_RELEASE = 21
#
# Early y+1 numbering
diff --git a/kernel.spec b/kernel.spec
index ccb9d7bf4..e05702696 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -85,7 +85,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
-%global distro_build 0.rc2.20211124git5d9f4cf36721.19
+%global distro_build 0.rc2.20211126gita4849f6000e2.21
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -132,13 +132,13 @@ Summary: The Linux kernel
%define rpmversion 5.16.0
%define patchversion 5.16
-%define pkgrelease 0.rc2.20211124git5d9f4cf36721.19
+%define pkgrelease 0.rc2.20211126gita4849f6000e2.21
# This is needed to do merge window version magic
%define patchlevel 16
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc2.20211124git5d9f4cf36721.19%{?buildid}%{?dist}
+%define specrelease 0.rc2.20211126gita4849f6000e2.21%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -684,7 +684,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16-rc2-54-g5d9f4cf36721.tar.xz
+Source0: linux-5.16-rc2-162-ga4849f6000e2.tar.xz
Source1: Makefile.rhelver
@@ -1376,8 +1376,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.16-rc2-54-g5d9f4cf36721 -c
-mv linux-5.16-rc2-54-g5d9f4cf36721 linux-%{KVERREL}
+%setup -q -n kernel-5.16-rc2-162-ga4849f6000e2 -c
+mv linux-5.16-rc2-162-ga4849f6000e2 linux-%{KVERREL}
cd linux-%{KVERREL}
# cp -a %{SOURCE1} .
diff --git a/patch-5.16-redhat.patch b/patch-5.16-redhat.patch
index 38660c98f..dd9ae85c6 100644
--- a/patch-5.16-redhat.patch
+++ b/patch-5.16-redhat.patch
@@ -128,7 +128,7 @@ index 000000000000..effb81d04bfd
+
+endmenu
diff --git a/Makefile b/Makefile
-index daf95a574b08..17a521cc03d7 100644
+index 72b0c3d5cbad..d84f7c164563 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -1552,7 +1552,7 @@ index 75dbe77b0b4b..029ff8576f8e 100644
err_netlink:
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index 4b5de8f5435a..798e401a2196 100644
+index 4c63564adeaa..3541ddd16644 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -244,6 +244,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
diff --git a/sources b/sources
index 175286f80..87d02040d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.16-rc2-54-g5d9f4cf36721.tar.xz) = ad432131817fe1c3c0b375c6bdf60fe396bd03cc1427447c3036c83f6c498a96b638dd3574c14761841fbd02dd67ee5d33e95608f045a575747a6e3ddc75a9a6
-SHA512 (kernel-abi-stablelists-5.16.0-0.rc2.20211124git5d9f4cf36721.19.tar.bz2) = 28da61596dc6925a6e647ec86d55538d9f898c02dda59cd199932455980fcbcf941f59ab5e3030c7e65a69bdbaa9821dcbbd11d540e7931d9969b2b8f0c1e730
-SHA512 (kernel-kabi-dw-5.16.0-0.rc2.20211124git5d9f4cf36721.19.tar.bz2) = 25c8723997e86cc43410d31415ebe3813dfc566f773b32ce920b62ce2342ff675864f11845046616ef1caeee8f8143efd4e9380ed5a5cf17df5b10e32f541328
+SHA512 (linux-5.16-rc2-162-ga4849f6000e2.tar.xz) = 4b82ade582a4cdc6ae9ebe2635f5cd4f5dbeb285e4cfd26d252905014661d578f2df35c04dcfb55d21d75f4fddfe4918dbc561766e14a2e8129d70fd3187573e
+SHA512 (kernel-abi-stablelists-5.16.0-0.rc2.20211126gita4849f6000e2.21.tar.bz2) = 3afb8d049f3c43df3434959bf24382c13b481cc19782d8971ad400385e4d83d42433c233b1f72027dbef84f1349db30ace10e1625a69af5ebab83889ade90ae0
+SHA512 (kernel-kabi-dw-5.16.0-0.rc2.20211126gita4849f6000e2.21.tar.bz2) = b5ce471b04d1012318328f20b744f3c8af8b08a8e45f0a85b7e11933ea74da2330e15e1a9c6879715b940da8f56725973a0fbc2f1d9c33c455f331efdf510684