From c82fb583adbef75b4bd26e514a8bc1a78a55cfad Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 11 Jan 2023 08:08:28 -0600 Subject: kernel-6.2.0-0.rc3.20230111git7dd4b804e080.26 * Wed Jan 11 2023 Fedora Kernel Team [6.2.0-0.rc3.7dd4b804e080.26] - Revert "redhat: fix elf got hardening for vm tools" (Don Zickus) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 3 --- kernel.spec | 12 +++++++----- patch-6.2-redhat.patch | 15 +-------------- sources | 6 +++--- 5 files changed, 12 insertions(+), 26 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index bae58f2f3..54241a0bb 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 = 25 +RHEL_RELEASE = 26 # # ZSTREAM diff --git a/Patchlist.changelog b/Patchlist.changelog index d044efcaa..f169f7c03 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,6 +1,3 @@ -"https://gitlab.com/cki-project/kernel-ark/-/commit"/53da54e5a7627db98a80a14b3bed1abc3128d03a - 53da54e5a7627db98a80a14b3bed1abc3128d03a Revert "arm64: remove special treatment for the link order of head.o" - "https://gitlab.com/cki-project/kernel-ark/-/commit"/77542637f2e84a847a7886979e0613332695c181 77542637f2e84a847a7886979e0613332695c181 Change acpi_bus_get_acpi_device to acpi_get_acpi_dev diff --git a/kernel.spec b/kernel.spec index 88ad0f898..1064576fb 100755 --- a/kernel.spec +++ b/kernel.spec @@ -126,13 +126,13 @@ Summary: The Linux kernel # define buildid .local %define specversion 6.2.0 %define patchversion 6.2 -%define pkgrelease 0.rc3.20230110git5a41237ad1d4.25 +%define pkgrelease 0.rc3.20230111git7dd4b804e080.26 %define kversion 6 -%define tarfile_release 6.2-rc3-9-g5a41237ad1d4 +%define tarfile_release 6.2-rc3-21-g7dd4b804e080 # This is needed to do merge window version magic %define patchlevel 2 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.20230110git5a41237ad1d4.25%{?buildid}%{?dist} +%define specrelease 0.rc3.20230111git7dd4b804e080.26%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.2.0 @@ -3179,9 +3179,11 @@ fi # # %changelog -* Tue Jan 10 2023 Fedora Kernel Team [6.2.0-0.rc3.5a41237ad1d4.25] +* Wed Jan 11 2023 Fedora Kernel Team [6.2.0-0.rc3.7dd4b804e080.26] - Revert "redhat: fix elf got hardening for vm tools" (Don Zickus) -- Revert "arm64: remove special treatment for the link order of head.o" (Justin M. Forbes) + +* Wed Jan 11 2023 Fedora Kernel Team [6.2.0-0.rc3.7dd4b804e080.25] +- Linux v6.2.0-0.rc3.7dd4b804e080 * Tue Jan 10 2023 Fedora Kernel Team [6.2.0-0.rc3.5a41237ad1d4.24] - redhat/configs: Enable CRYPTO_CURVE25519 in ark (Prarit Bhargava) diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch index a9a16c9cb..f708b688c 100644 --- a/patch-6.2-redhat.patch +++ b/patch-6.2-redhat.patch @@ -58,14 +58,13 @@ kernel/module/signing.c | 9 +- kernel/panic.c | 13 + kernel/rh_messages.c | 209 +++++++++ - scripts/head-object-list.txt | 1 + scripts/mod/modpost.c | 8 + scripts/tags.sh | 2 + security/integrity/platform_certs/load_uefi.c | 6 +- security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 67 files changed, 1541 insertions(+), 189 deletions(-) + 66 files changed, 1540 insertions(+), 189 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 6cfa6e3996cf..62b314faa050 100644 @@ -2888,18 +2887,6 @@ index 000000000000..586c3319f530 +#endif +} +EXPORT_SYMBOL(mark_partner_supported); -diff --git a/scripts/head-object-list.txt b/scripts/head-object-list.txt -index b074134cfac2..105ea7ac4751 100644 ---- a/scripts/head-object-list.txt -+++ b/scripts/head-object-list.txt -@@ -15,6 +15,7 @@ arch/alpha/kernel/head.o - arch/arc/kernel/head.o - arch/arm/kernel/head-nommu.o - arch/arm/kernel/head.o -+arch/arm64/kernel/head.o - arch/csky/kernel/head.o - arch/hexagon/kernel/head.o - arch/ia64/kernel/head.o diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index efff8078e395..1b4f8306cea6 100644 --- a/scripts/mod/modpost.c diff --git a/sources b/sources index 06352d9f7..c8908910c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.2-rc3-9-g5a41237ad1d4.tar.xz) = 25574001e584e4bf22be1c9001c3a980ac77e9d61186a72825ad74a7373799d1cad8986bf39f8be75fa94adf1b52a45d0a0ed6e2ffd609dfbd6567f2e95e14ad -SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = 894f1bafba83f7ae9e084e5fc46121a92de66cb0da89bdade41209636c348209c8dd62f8ad8c767d2f0380fa276884a0df3f00954ab3511acee1bf3069e83cba -SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = 22fd3aea3bafdfeed2c1a06c498ffa1e22b143af83b69ff705c72f6c53aab144cad95d93ed3a68149ef522c254f867e5953efa16fb72ee4a87d71c8f653a9d7d +SHA512 (linux-6.2-rc3-21-g7dd4b804e080.tar.xz) = 656e47e423ed7febbaed842750c5657e1ea9e1423456e18816323613e36f4a396ef85711bc6e9aaa51ef53be9f5c11cc5c00e10690a96b3e3f5045165c69d0d8 +SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = bf692d70ba6e63a11a41f511d9a373e1ee4a19c3d7ff89529d0b5bf56b8f05277cc971bde1349809c6c09d859ec0e3ba909c7807d60b020cb764fc100a985eef +SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = 0ec9a780bfec1ee3fe174c99d5eaf2c3bd966f4c1d36f75213dc8f23cd587013bae34c40142e0fea6c69d4835ffdfe2f187723ff3d471ebe20500b272d8589f9 -- cgit