kernel-5.16-0.rc2.20211124git5d9f4cf36721.19
* Wed Nov 24 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc2.20211124git5d9f4cf36721.19] - Fix up PREEMPT configs (Justin M. Forbes) - New configs in drivers/media (Fedora Kernel Team) - New configs in drivers/net/ethernet/litex (Fedora Kernel Team) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
parent
f381a440d3
commit
88e40a4683
@ -12,7 +12,7 @@ RHEL_MINOR = 99
|
|||||||
#
|
#
|
||||||
# Use this spot to avoid future merge conflicts.
|
# Use this spot to avoid future merge conflicts.
|
||||||
# Do not trim this comment.
|
# Do not trim this comment.
|
||||||
RHEL_RELEASE = 19
|
RHEL_RELEASE = 21
|
||||||
|
|
||||||
#
|
#
|
||||||
# Early y+1 numbering
|
# Early y+1 numbering
|
||||||
|
12
kernel.spec
12
kernel.spec
@ -85,7 +85,7 @@ Summary: The Linux kernel
|
|||||||
# the --with-release option overrides this setting.)
|
# the --with-release option overrides this setting.)
|
||||||
%define debugbuildsenabled 0
|
%define debugbuildsenabled 0
|
||||||
|
|
||||||
%global distro_build 0.rc2.20211124git5d9f4cf36721.19
|
%global distro_build 0.rc2.20211126gita4849f6000e2.21
|
||||||
|
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
%define secure_boot_arch x86_64
|
%define secure_boot_arch x86_64
|
||||||
@ -130,13 +130,13 @@ Summary: The Linux kernel
|
|||||||
|
|
||||||
%define rpmversion 5.16.0
|
%define rpmversion 5.16.0
|
||||||
%define patchversion 5.16
|
%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
|
# This is needed to do merge window version magic
|
||||||
%define patchlevel 16
|
%define patchlevel 16
|
||||||
|
|
||||||
# allow pkg_release to have configurable %%{?dist} tag
|
# 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}
|
%define pkg_release %{specrelease}
|
||||||
|
|
||||||
@ -682,7 +682,7 @@ BuildRequires: lld
|
|||||||
# exact git commit you can run
|
# exact git commit you can run
|
||||||
#
|
#
|
||||||
# xzcat -qq ${TARBALL} | git get-tar-commit-id
|
# 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
|
Source1: Makefile.rhelver
|
||||||
|
|
||||||
@ -1374,8 +1374,8 @@ ApplyOptionalPatch()
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
%setup -q -n kernel-5.16-rc2-54-g5d9f4cf36721 -c
|
%setup -q -n kernel-5.16-rc2-162-ga4849f6000e2 -c
|
||||||
mv linux-5.16-rc2-54-g5d9f4cf36721 linux-%{KVERREL}
|
mv linux-5.16-rc2-162-ga4849f6000e2 linux-%{KVERREL}
|
||||||
|
|
||||||
cd linux-%{KVERREL}
|
cd linux-%{KVERREL}
|
||||||
cp -a %{SOURCE1} .
|
cp -a %{SOURCE1} .
|
||||||
|
@ -128,7 +128,7 @@ index 000000000000..effb81d04bfd
|
|||||||
+
|
+
|
||||||
+endmenu
|
+endmenu
|
||||||
diff --git a/Makefile b/Makefile
|
diff --git a/Makefile b/Makefile
|
||||||
index daf95a574b08..17a521cc03d7 100644
|
index 72b0c3d5cbad..d84f7c164563 100644
|
||||||
--- a/Makefile
|
--- a/Makefile
|
||||||
+++ b/Makefile
|
+++ b/Makefile
|
||||||
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
|
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
|
||||||
@ -1552,7 +1552,7 @@ index 75dbe77b0b4b..029ff8576f8e 100644
|
|||||||
|
|
||||||
err_netlink:
|
err_netlink:
|
||||||
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
|
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
|
--- a/drivers/nvme/host/core.c
|
||||||
+++ b/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)
|
@@ -244,6 +244,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
|
||||||
|
6
sources
6
sources
@ -1,3 +1,3 @@
|
|||||||
SHA512 (linux-5.16-rc2-54-g5d9f4cf36721.tar.xz) = ad432131817fe1c3c0b375c6bdf60fe396bd03cc1427447c3036c83f6c498a96b638dd3574c14761841fbd02dd67ee5d33e95608f045a575747a6e3ddc75a9a6
|
SHA512 (linux-5.16-rc2-162-ga4849f6000e2.tar.xz) = 4b82ade582a4cdc6ae9ebe2635f5cd4f5dbeb285e4cfd26d252905014661d578f2df35c04dcfb55d21d75f4fddfe4918dbc561766e14a2e8129d70fd3187573e
|
||||||
SHA512 (kernel-abi-stablelists-5.16.0-0.rc2.20211124git5d9f4cf36721.19.tar.bz2) = 28da61596dc6925a6e647ec86d55538d9f898c02dda59cd199932455980fcbcf941f59ab5e3030c7e65a69bdbaa9821dcbbd11d540e7931d9969b2b8f0c1e730
|
SHA512 (kernel-abi-stablelists-5.16.0-0.rc2.20211126gita4849f6000e2.21.tar.bz2) = 3afb8d049f3c43df3434959bf24382c13b481cc19782d8971ad400385e4d83d42433c233b1f72027dbef84f1349db30ace10e1625a69af5ebab83889ade90ae0
|
||||||
SHA512 (kernel-kabi-dw-5.16.0-0.rc2.20211124git5d9f4cf36721.19.tar.bz2) = 25c8723997e86cc43410d31415ebe3813dfc566f773b32ce920b62ce2342ff675864f11845046616ef1caeee8f8143efd4e9380ed5a5cf17df5b10e32f541328
|
SHA512 (kernel-kabi-dw-5.16.0-0.rc2.20211126gita4849f6000e2.21.tar.bz2) = b5ce471b04d1012318328f20b744f3c8af8b08a8e45f0a85b7e11933ea74da2330e15e1a9c6879715b940da8f56725973a0fbc2f1d9c33c455f331efdf510684
|
||||||
|
Loading…
Reference in New Issue
Block a user