From 033e511447ba8abd5e93ec3c0e2c177139466843 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 26 Dec 2022 10:31:20 -0600 Subject: kernel-6.2.0-0.rc1.14 * Mon Dec 26 2022 Fedora Kernel Team [6.2.0-0.rc1.14] - 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) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 4 ++-- kernel-aarch64-debug-fedora.config | 1 + kernel-aarch64-debug-rhel.config | 1 + kernel-aarch64-fedora.config | 1 + kernel-aarch64-rhel.config | 1 + kernel-armv7hl-debug-fedora.config | 1 + kernel-armv7hl-fedora.config | 1 + kernel-armv7hl-lpae-debug-fedora.config | 1 + kernel-armv7hl-lpae-fedora.config | 1 + kernel-ppc64le-debug-fedora.config | 1 + kernel-ppc64le-debug-rhel.config | 1 + kernel-ppc64le-fedora.config | 1 + kernel-ppc64le-rhel.config | 1 + kernel-s390x-debug-fedora.config | 1 + kernel-s390x-debug-rhel.config | 1 + kernel-s390x-fedora.config | 1 + kernel-s390x-rhel.config | 1 + kernel-s390x-zfcpdump-rhel.config | 1 + kernel-x86_64-debug-fedora.config | 1 + kernel-x86_64-debug-rhel.config | 1 + kernel-x86_64-fedora.config | 1 + kernel-x86_64-rhel.config | 1 + kernel.spec | 16 +++++++++++----- patch-6.2-redhat.patch | 8 ++++---- sources | 6 +++--- 26 files changed, 42 insertions(+), 15 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index e9612fa4c..5e65c2fc9 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 = 12 +RHEL_RELEASE = 14 # # ZSTREAM diff --git a/Patchlist.changelog b/Patchlist.changelog index 892c81598..5b5a58ca5 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -"https://gitlab.com/cki-project/kernel-ark/-/commit"/cc27ad60a7f69338737d114384a5d39b0c731ef0 - cc27ad60a7f69338737d114384a5d39b0c731ef0 Revert "arm64: remove special treatment for the link order of head.o" +"https://gitlab.com/cki-project/kernel-ark/-/commit"/ab7b4e0cd7bf09cc20db4ba66092ffe222271a26 + ab7b4e0cd7bf09cc20db4ba66092ffe222271a26 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-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index b33f86dc9..1f6a63655 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -7305,6 +7305,7 @@ CONFIG_SND_SOC_IMX_SPDIF=m # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98927 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825 is not set +# CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 89852e85e..6be9d4fc3 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -5780,6 +5780,7 @@ CONFIG_SND_SOC_CX2072X=m # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98927 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825 is not set +# CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index ef6c3155b..760b31b43 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -7283,6 +7283,7 @@ CONFIG_SND_SOC_IMX_SPDIF=m # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98927 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825 is not set +# CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 353253207..a6f333ca3 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -5756,6 +5756,7 @@ CONFIG_SND_SOC_CX2072X=m # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98927 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825 is not set +# CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 40ab021dd..bc906b5f4 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -7331,6 +7331,7 @@ CONFIG_SND_SOC_IMX_SPDIF=m # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98927 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825 is not set +# CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index c57a39ca0..1d393f083 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -7311,6 +7311,7 @@ CONFIG_SND_SOC_IMX_SPDIF=m # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98927 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825 is not set +# CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 2c0c1aee8..cc02d03ac 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -7137,6 +7137,7 @@ CONFIG_SND_SOC_IMX_SPDIF=m # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98927 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825 is not set +# CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 16ef93894..9f366c955 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -7117,6 +7117,7 @@ CONFIG_SND_SOC_IMX_SPDIF=m # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98927 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825 is not set +# CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index c539e3225..8e4ed2e73 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -6144,6 +6144,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98927 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825 is not set +# CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 1fcd4bfe5..039c8a5d1 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -5533,6 +5533,7 @@ CONFIG_SND_SOC_CX2072X=m # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98927 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825 is not set +# CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index c441252f6..9fd4f1c08 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -6122,6 +6122,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98927 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825 is not set +# CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index f5a10a83a..365b1c215 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -5511,6 +5511,7 @@ CONFIG_SND_SOC_CX2072X=m # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98927 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825 is not set +# CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 7c7b031d7..84da7fb59 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -6088,6 +6088,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98927 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825 is not set +# CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 138087c9c..1a2515cf7 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -5510,6 +5510,7 @@ CONFIG_SND_SOC_CX2072X=m # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98927 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825 is not set +# CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index fb4a133ef..84ebfcc83 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -6066,6 +6066,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98927 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825 is not set +# CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 4b86f8168..4e587eab3 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -5488,6 +5488,7 @@ CONFIG_SND_SOC_CX2072X=m # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98927 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825 is not set +# CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index c9dc5b9b2..067cf1d18 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -5508,6 +5508,7 @@ CONFIG_SND_SOC_CX2072X=m # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98927 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825 is not set +# CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 718b59a99..9c0bf4481 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -6516,6 +6516,7 @@ CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A=m CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373=m # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98927 is not set CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825=m +# CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE is not set CONFIG_SND_SOC_INTEL_AVS_MACH_RT274=m CONFIG_SND_SOC_INTEL_AVS_MACH_RT286=m CONFIG_SND_SOC_INTEL_AVS_MACH_RT298=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index b6005d864..4428eab34 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -5740,6 +5740,7 @@ CONFIG_SND_SOC_INTEL_AVS=m # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98927 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825 is not set +# CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 4dd13125a..75a199cdd 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -6495,6 +6495,7 @@ CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A=m CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373=m # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98927 is not set CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825=m +# CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE is not set CONFIG_SND_SOC_INTEL_AVS_MACH_RT274=m CONFIG_SND_SOC_INTEL_AVS_MACH_RT286=m CONFIG_SND_SOC_INTEL_AVS_MACH_RT298=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 4a644466a..7e948e7ea 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -5717,6 +5717,7 @@ CONFIG_SND_SOC_INTEL_AVS=m # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98927 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825 is not set +# CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set # CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set diff --git a/kernel.spec b/kernel.spec index 9d0e3cf33..cb6fb9c44 100755 --- a/kernel.spec +++ b/kernel.spec @@ -122,17 +122,17 @@ Summary: The Linux kernel # Set debugbuildsenabled to 0 to not build a separate debug kernel, but # to build the base kernel using the debug configuration. (Specifying # the --with-release option overrides this setting.) -%define debugbuildsenabled 0 +%define debugbuildsenabled 1 # define buildid .local %define specversion 6.2.0 %define patchversion 6.2 -%define pkgrelease 0.rc0.20221223git8395ae05cb5a.12 +%define pkgrelease 0.rc1.14 %define kversion 6 -%define tarfile_release 6.1-14446-g8395ae05cb5a +%define tarfile_release 6.2-rc1 # This is needed to do merge window version magic %define patchlevel 2 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20221223git8395ae05cb5a.12%{?buildid}%{?dist} +%define specrelease 0.rc1.14%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.2.0 @@ -3179,10 +3179,16 @@ fi # # %changelog -* Fri Dec 23 2022 Fedora Kernel Team [6.2.0-0.rc0.8395ae05cb5a.12] +* Mon Dec 26 2022 Fedora Kernel Team [6.2.0-0.rc1.14] - 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) +* Mon Dec 26 2022 Fedora Kernel Team [6.2.0-0.rc1.13] +- Linux v6.2.0-0.rc1 + +* Sat Dec 24 2022 Fedora Kernel Team [6.2.0-0.rc0.72a85e2b0a1e.12] +- Linux v6.2.0-0.rc0.72a85e2b0a1e + * Fri Dec 23 2022 Fedora Kernel Team [6.2.0-0.rc0.8395ae05cb5a.11] - Linux v6.2.0-0.rc0.8395ae05cb5a diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch index bf29c9896..ba27174c3 100644 --- a/patch-6.2-redhat.patch +++ b/patch-6.2-redhat.patch @@ -121,7 +121,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 25247f931872..f72f0ed52e78 100644 +index d4b6af8c09e9..8223bfdea30b 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -2547,7 +2547,7 @@ index 7e5c3ddc341d..850393c608ef 100644 default y help diff --git a/kernel/Makefile b/kernel/Makefile -index e7fc37a68069..b91424eebd96 100644 +index 10ef068f598d..d7953f0ee28a 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -12,6 +12,7 @@ obj-y = fork.o exec_domain.o panic.o \ @@ -2650,10 +2650,10 @@ index a2ff4242e623..f0d2be1ee4f1 100644 int module_sig_check(struct load_info *info, int flags) diff --git a/kernel/panic.c b/kernel/panic.c -index 326d91505f04..44b01e472228 100644 +index 463c9295bc28..9f4d0cefeceb 100644 --- a/kernel/panic.c +++ b/kernel/panic.c -@@ -467,6 +467,19 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = { +@@ -470,6 +470,19 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = { [ TAINT_AUX ] = { 'X', ' ', true }, [ TAINT_RANDSTRUCT ] = { 'T', ' ', true }, [ TAINT_TEST ] = { 'N', ' ', true }, diff --git a/sources b/sources index 7f46c835d..1f590b189 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.1-14446-g8395ae05cb5a.tar.xz) = def0bd4846b8497fb658ac50947fb70119f51bdf8faca4d100c4c9d9b98f3606ff74d68e19a0f896e9a4da82fbbaa4fd205052df49e2bbe8bb68bd07580a2361 -SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = 6820d00b569536703a4ea278ab7cb4a11f4789ba51450a176f189fa8ba87d96bcfd365a5d696e580047d2ab90b2c17cd945b7dbe9d73f9cca571a2374710e3ba -SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = bd8f7b9df57e6559c20395187cb138c4b867a8e48484838269ecce7e35c3e63c9325f9f3fe6d3e2284e0dbb7ec05e6ba9e8465ddc6dfee3504f82e7d1e7aad9b +SHA512 (linux-6.2-rc1.tar.xz) = 080f41abfb1d1f758a4bc1ccf1bb95b74da1f294ba53ff94bd72d66768f2430825fe54cd8fa5c4378d1d50d9386a01ca3fed87d49ec2f6e7573d9ac51861e925 +SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = 62cae4b30ae5126468a1975f99339107a48e267a40e0daac09e6d0fe3c9fae23d1388e249a5c9666bc737269426f0ea3049391438237ce2c423859b0287c7e09 +SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = b5e60bbae21bfa4f1057611f933b76a56a68ed2880985216648fdf863b72da82e016a4c01e66c4fe6262eed026b05dfa88bf818b4927c64ae90d3f5e4907136c -- cgit From 90ce4749d5a8f57865d69a1d04766619d6da5484 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 30 Dec 2022 08:12:55 -0600 Subject: kernel-6.2.0-0.rc1.20221230gitbff687b3dad6.15 * Fri Dec 30 2022 Fedora Kernel Team [6.2.0-0.rc1.bff687b3dad6.15] - 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) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 4 ++-- kernel.spec | 13 ++++++++----- patch-6.2-redhat.patch | 4 ++-- sources | 6 +++--- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 5e65c2fc9..39d4dc1fe 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 = 14 +RHEL_RELEASE = 15 # # ZSTREAM diff --git a/Patchlist.changelog b/Patchlist.changelog index 5b5a58ca5..1c694f17b 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -"https://gitlab.com/cki-project/kernel-ark/-/commit"/ab7b4e0cd7bf09cc20db4ba66092ffe222271a26 - ab7b4e0cd7bf09cc20db4ba66092ffe222271a26 Revert "arm64: remove special treatment for the link order of head.o" +"https://gitlab.com/cki-project/kernel-ark/-/commit"/31440cec143449a0901c418d13ec9dbdd61ab8ce + 31440cec143449a0901c418d13ec9dbdd61ab8ce 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 cb6fb9c44..d0e7a797a 100755 --- a/kernel.spec +++ b/kernel.spec @@ -122,17 +122,17 @@ Summary: The Linux kernel # Set debugbuildsenabled to 0 to not build a separate debug kernel, but # to build the base kernel using the debug configuration. (Specifying # the --with-release option overrides this setting.) -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 # define buildid .local %define specversion 6.2.0 %define patchversion 6.2 -%define pkgrelease 0.rc1.14 +%define pkgrelease 0.rc1.20221230gitbff687b3dad6.15 %define kversion 6 -%define tarfile_release 6.2-rc1 +%define tarfile_release 6.2-rc1-68-gbff687b3dad6 # This is needed to do merge window version magic %define patchlevel 2 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.14%{?buildid}%{?dist} +%define specrelease 0.rc1.20221230gitbff687b3dad6.15%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.2.0 @@ -3179,10 +3179,13 @@ fi # # %changelog -* Mon Dec 26 2022 Fedora Kernel Team [6.2.0-0.rc1.14] +* Fri Dec 30 2022 Fedora Kernel Team [6.2.0-0.rc1.bff687b3dad6.15] - 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) +* Fri Dec 30 2022 Fedora Kernel Team [6.2.0-0.rc1.bff687b3dad6.14] +- Linux v6.2.0-0.rc1.bff687b3dad6 + * Mon Dec 26 2022 Fedora Kernel Team [6.2.0-0.rc1.13] - Linux v6.2.0-0.rc1 diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch index ba27174c3..8f14182f4 100644 --- a/patch-6.2-redhat.patch +++ b/patch-6.2-redhat.patch @@ -1229,7 +1229,7 @@ index ee4da9ab8013..d395d11eadc4 100644 if (ret < 0) goto err_allowedips; diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 95c488ea91c3..fad3f16d463f 100644 +index 7be562a4e1aa..0169d9f5df9b 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -250,6 +250,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -1343,7 +1343,7 @@ index c03093b6813c..46a71df1fbd1 100644 if (!ctrl->max_namespaces || diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h -index 6bbb73ef8b25..1c99a8a525c9 100644 +index 424c8a467a0c..3230b91d3476 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -873,6 +873,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys); diff --git a/sources b/sources index 1f590b189..c4f6a7d2b 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.2-rc1.tar.xz) = 080f41abfb1d1f758a4bc1ccf1bb95b74da1f294ba53ff94bd72d66768f2430825fe54cd8fa5c4378d1d50d9386a01ca3fed87d49ec2f6e7573d9ac51861e925 -SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = 62cae4b30ae5126468a1975f99339107a48e267a40e0daac09e6d0fe3c9fae23d1388e249a5c9666bc737269426f0ea3049391438237ce2c423859b0287c7e09 -SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = b5e60bbae21bfa4f1057611f933b76a56a68ed2880985216648fdf863b72da82e016a4c01e66c4fe6262eed026b05dfa88bf818b4927c64ae90d3f5e4907136c +SHA512 (linux-6.2-rc1-68-gbff687b3dad6.tar.xz) = dbbe474460e7dbfc6962c9dbe73da394f36240a466d4b6bd9f3c56e08618296799dfe1588bac7d9c57f6acca67f5ca2d6950cb5e41bc3cc1c476ceffe6b60770 +SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = b3d53f00e63f466f07c2e0bf512a9e53b6f1cfc8263da5272993cfbda1888f0a10256d6fa15f3ae43f25a5bd597f7416dd13e9f43d7fface92c9e6e3d33b3c89 +SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = 52c2023b26d20452be4b915f5c6100db648da467d780f16dc4b4f332706eb3dcd001f3c0f50cdb80315c8674c753afc938b51287c56f2f0b19f11310570fa8c0 -- cgit