diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-02-21 20:28:28 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-02-21 20:28:28 +0100 |
commit | b4228a41553b4cc73f3c4e98c7a712e3e6f5ba5b (patch) | |
tree | 2d38b1cbd6f421c0ef32d6f443fbcb482d7eb8f0 | |
parent | 7fd138fbbc8257b0e2d0488a6719a07874414f3b (diff) | |
parent | b515c783b6e4ef85e20b04b5d93b46854ec4afed (diff) | |
download | kernel-b4228a41553b4cc73f3c4e98c7a712e3e6f5ba5b.tar.gz kernel-b4228a41553b4cc73f3c4e98c7a712e3e6f5ba5b.tar.xz kernel-b4228a41553b4cc73f3c4e98c7a712e3e6f5ba5b.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.17.0-0.rc5.102.vanilla.1.fc37kernel-5.17.0-0.rc5.102.vanilla.1.fc36kernel-5.17.0-0.rc5.102.vanilla.1.fc35kernel-5.17.0-0.rc5.102.vanilla.1.fc34
-rw-r--r-- | Makefile.rhelver | 2 | ||||
-rw-r--r-- | Patchlist.changelog | 4 | ||||
-rwxr-xr-x | kernel.spec | 14 | ||||
-rw-r--r-- | patch-5.17-redhat.patch | 6 | ||||
-rw-r--r-- | sources | 6 |
5 files changed, 16 insertions, 16 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index 623169e60..2f1ebf4e5 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 = 100 +RHEL_RELEASE = 102 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index e20f64f19..1f683b85c 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/2a5b4cb01ce15645555568d370741862f00eb28e - 2a5b4cb01ce15645555568d370741862f00eb28e mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning +https://gitlab.com/cki-project/kernel-ark/-/commit/a225ad3aaaf8a13ed474930bc3b204b396d978d2 + a225ad3aaaf8a13ed474930bc3b204b396d978d2 mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning https://gitlab.com/cki-project/kernel-ark/-/commit/4f79b3c547b8e3dbc014058a8adffe0fe8cd5e4b 4f79b3c547b8e3dbc014058a8adffe0fe8cd5e4b objtool: check: give big enough buffer for pv_ops diff --git a/kernel.spec b/kernel.spec index 13aa73f99..d14050200 100755 --- a/kernel.spec +++ b/kernel.spec @@ -87,7 +87,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 0.rc4.20220218git9195e5e0adbb.100 +%global distro_build 0.rc5.102 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -134,13 +134,13 @@ Summary: The Linux kernel %define rpmversion 5.17.0 %define patchversion 5.17 -%define pkgrelease 0.rc4.20220218git9195e5e0adbb.100 +%define pkgrelease 0.rc5.102 # This is needed to do merge window version magic %define patchlevel 17 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.20220218git9195e5e0adbb.100%{?buildid}%{?dist} +%define specrelease 0.rc5.102%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -697,7 +697,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.17-rc4-162-g9195e5e0adbb.tar.xz +Source0: linux-5.17-rc5.tar.xz Source1: Makefile.rhelver @@ -1393,8 +1393,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.17-rc4-162-g9195e5e0adbb -c -mv linux-5.17-rc4-162-g9195e5e0adbb linux-%{KVERREL} +%setup -q -n kernel-5.17-rc5 -c +mv linux-5.17-rc5 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -3011,7 +3011,7 @@ fi # # %changelog -* Fri Feb 18 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc4.9195e5e0adbb.100] +* Mon Feb 21 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc5.102] - mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long) * Fri Feb 18 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc4.9195e5e0adbb.99] diff --git a/patch-5.17-redhat.patch b/patch-5.17-redhat.patch index cd6165578..8b0235634 100644 --- a/patch-5.17-redhat.patch +++ b/patch-5.17-redhat.patch @@ -130,7 +130,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 51e142f760f7..3abb272fb795 100644 +index 289ce2be8032..019a57436c23 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1552,7 +1552,7 @@ index ee4da9ab8013..0f217997a764 100644 err_netlink: diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 79005ea1a33e..355445ee7956 100644 +index 469f23186159..9056b9b3016e 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) @@ -1619,7 +1619,7 @@ index 79005ea1a33e..355445ee7956 100644 } EXPORT_SYMBOL_GPL(nvme_complete_rq); diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c -index f8bf6606eb2f..88383f443a58 100644 +index ff775235534c..94de4ecefe56 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -101,14 +101,10 @@ bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, int *flags) @@ -1,3 +1,3 @@ -SHA512 (linux-5.17-rc4-162-g9195e5e0adbb.tar.xz) = db1447e3428c1b7a82b4aeb908ce2e8fa44eec3de0e20fc503d40d5595633000c6464a6a2069ab4eb4f82957583d84b7d98fbfe303be90ede6c33ae5b6dab8e8 -SHA512 (kernel-abi-stablelists-5.17.0-0.rc4.20220218git9195e5e0adbb.100.tar.bz2) = 4afa0263bdb70fd849f206cf9d822547074f0ad9e601156bcecb2c2be286e7123222bcca534eb1e0812396bf4c11124191c3e39218e9fcb22de1767afe808ee8 -SHA512 (kernel-kabi-dw-5.17.0-0.rc4.20220218git9195e5e0adbb.100.tar.bz2) = b0e55eb761b5a54f601ad44de05b51b78bb2555235e893458c2843ced3a862a9dc45ca79c55349a348d8f16bc9889e3cbefbecead507c7f2f7583a919ddae3d2 +SHA512 (linux-5.17-rc5.tar.xz) = f452302a452b52ce8a5ff4a5fd03e18536c5b742ba307d59f496c291f68ce81e1215f500582b851a5343b253e08bc06cebe1ff68c87de190c6dc79c6eda21faa +SHA512 (kernel-abi-stablelists-5.17.0-0.rc5.102.tar.bz2) = 900263442814d4df7c2f4e5e57506c6177ee201fffa49a4b8d1f03b1b04c8cd1e27eccfc72e87146744538269865916e301338ac20927f10e16a8cb6d231a1a1 +SHA512 (kernel-kabi-dw-5.17.0-0.rc5.102.tar.bz2) = 63ee61c9390da45ec9aba1b1454902c2b675910d79caf50fd645754f27b0347f8457743febb0b0ff66ca6fc28ee1bdaa9171eb917d64be90b35a967356cf93ca |