From 91d850cab7e035bc8eecf43dcddb314468f71c55 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 25 Jan 2023 11:56:06 -0600 Subject: kernel-6.2.0-0.rc5.20230125git948ef7bb70c4.40 * Wed Jan 25 2023 Fedora Kernel Team [6.2.0-0.rc5.948ef7bb70c4.40] - Turn on debug builds for aarch64 Fedora (Justin M. Forbes) - Turn off forced debug builds (Justin M. Forbes) - Revert "redhat: fix elf got hardening for vm tools" (Don Zickus) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-debug-rhel.config | 2 +- kernel-aarch64-rhel.config | 2 +- kernel-ppc64le-debug-rhel.config | 2 +- kernel-ppc64le-rhel.config | 2 +- kernel-s390x-debug-rhel.config | 2 +- kernel-s390x-rhel.config | 2 +- kernel-s390x-zfcpdump-rhel.config | 2 +- kernel-x86_64-debug-rhel.config | 2 +- kernel-x86_64-rhel.config | 2 +- kernel.spec | 17 +++++++++++------ patch-6.2-redhat.patch | 4 ++-- sources | 6 +++--- 13 files changed, 26 insertions(+), 21 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 8f0230ed4..679b748aa 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 = 39 +RHEL_RELEASE = 40 # # ZSTREAM diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 1a65c46b1..a837e96ae 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -3128,7 +3128,7 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_MAILBOX_TEST=m CONFIG_MAILBOX=y # CONFIG_MANAGER_SBS is not set -# CONFIG_MANA_INFINIBAND is not set +CONFIG_MANA_INFINIBAND=m CONFIG_MANTIS_CORE=m # CONFIG_MARCH_Z16 is not set CONFIG_MARVELL_10G_PHY=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 66f8a5e30..c2decfdfe 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -3107,7 +3107,7 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_MAILBOX_TEST is not set CONFIG_MAILBOX=y # CONFIG_MANAGER_SBS is not set -# CONFIG_MANA_INFINIBAND is not set +CONFIG_MANA_INFINIBAND=m CONFIG_MANTIS_CORE=m # CONFIG_MARCH_Z16 is not set CONFIG_MARVELL_10G_PHY=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 25a737a19..7a6697282 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -2933,7 +2933,7 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_MAILBOX is not set # CONFIG_MAILBOX_TEST is not set # CONFIG_MANAGER_SBS is not set -# CONFIG_MANA_INFINIBAND is not set +CONFIG_MANA_INFINIBAND=m CONFIG_MANTIS_CORE=m # CONFIG_MARCH_Z16 is not set CONFIG_MARVELL_10G_PHY=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 865a37c77..73311cd2a 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -2913,7 +2913,7 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_MAILBOX is not set # CONFIG_MAILBOX_TEST is not set # CONFIG_MANAGER_SBS is not set -# CONFIG_MANA_INFINIBAND is not set +CONFIG_MANA_INFINIBAND=m CONFIG_MANTIS_CORE=m # CONFIG_MARCH_Z16 is not set CONFIG_MARVELL_10G_PHY=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 20dfc61a0..e97ea1d31 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -2912,7 +2912,7 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_MAILBOX is not set # CONFIG_MAILBOX_TEST is not set # CONFIG_MANAGER_SBS is not set -# CONFIG_MANA_INFINIBAND is not set +CONFIG_MANA_INFINIBAND=m CONFIG_MANTIS_CORE=m # CONFIG_MARCH_Z10 is not set # CONFIG_MARCH_Z13 is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 30be57943..8ba959f83 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -2892,7 +2892,7 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_MAILBOX is not set # CONFIG_MAILBOX_TEST is not set # CONFIG_MANAGER_SBS is not set -# CONFIG_MANA_INFINIBAND is not set +CONFIG_MANA_INFINIBAND=m CONFIG_MANTIS_CORE=m # CONFIG_MARCH_Z10 is not set # CONFIG_MARCH_Z13 is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index d51c191fd..ab2fc8557 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -2904,7 +2904,7 @@ CONFIG_MAGIC_SYSRQ_SERIAL=y # CONFIG_MAILBOX is not set # CONFIG_MAILBOX_TEST is not set # CONFIG_MANAGER_SBS is not set -# CONFIG_MANA_INFINIBAND is not set +CONFIG_MANA_INFINIBAND=m CONFIG_MANTIS_CORE=m # CONFIG_MARCH_Z10 is not set # CONFIG_MARCH_Z13 is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 653675a00..2e687d820 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -3097,7 +3097,7 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_MAILBOX_TEST is not set CONFIG_MAILBOX=y # CONFIG_MANAGER_SBS is not set -# CONFIG_MANA_INFINIBAND is not set +CONFIG_MANA_INFINIBAND=m CONFIG_MANTIS_CORE=m # CONFIG_MARCH_Z16 is not set CONFIG_MARVELL_10G_PHY=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index d6f02ea69..b3384e856 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -3077,7 +3077,7 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_MAILBOX_TEST is not set CONFIG_MAILBOX=y # CONFIG_MANAGER_SBS is not set -# CONFIG_MANA_INFINIBAND is not set +CONFIG_MANA_INFINIBAND=m CONFIG_MANTIS_CORE=m # CONFIG_MARCH_Z16 is not set CONFIG_MARVELL_10G_PHY=m diff --git a/kernel.spec b/kernel.spec index 31d2aa098..e6926939d 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.rc5.20230124git7bf70dbb1882.39 +%define pkgrelease 0.rc5.20230125git948ef7bb70c4.40 %define kversion 6 -%define tarfile_release 6.2-rc5-20-g7bf70dbb1882 +%define tarfile_release 6.2-rc5-45-g948ef7bb70c4 # This is needed to do merge window version magic %define patchlevel 2 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.20230124git7bf70dbb1882.39%{?buildid}%{?dist} +%define specrelease 0.rc5.20230125git948ef7bb70c4.40%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.2.0 @@ -388,8 +388,8 @@ Summary: The Linux kernel %endif %if 0%{?fedora} -# don't do debug builds on anything but i686 and x86_64 -%ifnarch i686 x86_64 +# don't do debug builds on anything but aarch64 and x86_64 +%ifnarch aarch64 x86_64 %define with_debug 0 %endif %endif @@ -3220,10 +3220,15 @@ fi # # %changelog -* Tue Jan 24 2023 Fedora Kernel Team [6.2.0-0.rc5.7bf70dbb1882.39] +* Wed Jan 25 2023 Fedora Kernel Team [6.2.0-0.rc5.948ef7bb70c4.40] +- Turn on debug builds for aarch64 Fedora (Justin M. Forbes) - Turn off forced debug builds (Justin M. Forbes) - Revert "redhat: fix elf got hardening for vm tools" (Don Zickus) +* Wed Jan 25 2023 Fedora Kernel Team [6.2.0-0.rc5.948ef7bb70c4.39] +- gitlab-ci: use CI templates from production branch (Michael Hofmann) +- Linux v6.2.0-0.rc5.948ef7bb70c4 + * Tue Jan 24 2023 Fedora Kernel Team [6.2.0-0.rc5.7bf70dbb1882.38] - redhat/kernel.spec.template: Fix internal "File listed twice" errors (Prarit Bhargava) - redhat: Remove stale .tmp_versions code and comments (Prarit Bhargava) diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch index bdef48ffe..0b3e296a3 100644 --- a/patch-6.2-redhat.patch +++ b/patch-6.2-redhat.patch @@ -1533,7 +1533,7 @@ index 50a577ac3bb4..6f862b855ccf 100644 { 0 } }; diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c -index 4dbf51e2623a..015e55d07a4f 100644 +index f6da34850af9..f994f3ce8851 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -82,7 +82,9 @@ MODULE_DESCRIPTION("Driver for HP Smart Array Controller version " \ @@ -2606,7 +2606,7 @@ index ecca9366c7a6..be37bb092f7a 100644 } diff --git a/kernel/module/main.c b/kernel/module/main.c -index 48568a0f5651..e0dbce757beb 100644 +index 4ac3fe43e6c8..5b2604d7e2a7 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -521,6 +521,7 @@ static struct module_attribute modinfo_##field = { \ diff --git a/sources b/sources index 6d6b96e8c..c1a1d5ee1 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.2-rc5-20-g7bf70dbb1882.tar.xz) = aa8709bd4f3c7189facd1425fe97fe0959114fb6fb7953e2276838c0f273efba1e4b8ac06037955c7dc0a5a14b9f72813e76c550e6c5cff45f2304e04ddb9d9e -SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = 97ec87e6fd3b6199f6c3226b7363e91d03f2faacf7094a93469a0393ce40445d5075bd9ee0b4a1172e554d48cfbc96e5cebebe990405de21223465fc563b629e -SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = 7c1b41210458207a8c9429eb0f6670b7552d45391f74dcb0f97cb72627c79f5878e37f118d230f7a8477b3d6093b23a51b65c2fbdb0c4cd58b724545f399029b +SHA512 (linux-6.2-rc5-45-g948ef7bb70c4.tar.xz) = ef42828dccd9ac9696e0eb3aebed2df875f2e284f202ac14d6e46e06c1a4b399bed62d9101a0f95467fdfb1cab49e74ee51f699a89f48f7f26f6f3daeb329977 +SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = 2927b058a64ec0c81636ba46dbd75f61bd0a3ef1fc36973df36dbf58e73d190fcd36b7d0b817d3f14b0379c7d81136a4078c6bf54dbde12951c83ba32f326e14 +SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = 27a27d06292b211c68ca727a9bee231bd856cdc67d5b19784bcae7dfb8647ee485b447c99cb34cb7b74a082b8ea040066142faec79cc4c74eddb4331ce2daeb7 -- cgit