From 6eb46a8a707658f8c243c2d9db0f4275b0dec8ad Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Sat, 7 Jan 2023 10:40:42 -0600 Subject: kernel-6.0.18-200 * Sat Jan 07 2023 Justin M. Forbes [6.0.18-0] - Linux v6.0.18 Resolves: Signed-off-by: Justin M. Forbes --- kernel.spec | 9 ++++++--- patch-6.0-redhat.patch | 41 +++++++---------------------------------- sources | 6 +++--- 3 files changed, 16 insertions(+), 40 deletions(-) diff --git a/kernel.spec b/kernel.spec index e394b01ad..1a9abd76b 100755 --- a/kernel.spec +++ b/kernel.spec @@ -122,17 +122,17 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specversion 6.0.17 +%define specversion 6.0.18 %define patchversion 6.0 %define pkgrelease 200 %define kversion 6 -%define tarfile_release 6.0.17 +%define tarfile_release 6.0.18 # This is needed to do merge window version magic %define patchlevel 0 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 200%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.0.17 +%define kabiversion 6.0.18 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -3180,6 +3180,9 @@ fi # # %changelog +* Sat Jan 07 2023 Justin M. Forbes [6.0.18-0] +- Linux v6.0.18 + * Wed Jan 04 2023 Justin M. Forbes [6.0.17-0] - Linux v6.0.17 diff --git a/patch-6.0-redhat.patch b/patch-6.0-redhat.patch index 7b9dc7836..3106d497e 100644 --- a/patch-6.0-redhat.patch +++ b/patch-6.0-redhat.patch @@ -48,7 +48,7 @@ 47 files changed, 767 insertions(+), 367 deletions(-) diff --git a/Makefile b/Makefile -index a0ddac5b7caf..4928c29f049a 100644 +index 0104f69d30bb..20a377175eed 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -331,7 +331,7 @@ index bbf7029e224b..cf7faa970dd6 100644 dmi_decode_ipmi((const struct dmi_header *) dev->device_data); diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c -index c9e32d100b7e..bfe9bd1fde24 100644 +index b151cbfc3d9b..8ec5772f8bb0 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c @@ -35,6 +35,7 @@ @@ -342,7 +342,7 @@ index c9e32d100b7e..bfe9bd1fde24 100644 #include #define IPMI_DRIVER_VERSION "39.2" -@@ -5520,8 +5521,21 @@ static int __init ipmi_init_msghandler_mod(void) +@@ -5522,8 +5523,21 @@ static int __init ipmi_init_msghandler_mod(void) { int rv; @@ -1269,7 +1269,7 @@ index 49238ddd39ee..5d8c37c3e15a 100644 if (!pci_dev->driver) return 0; diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c -index 95bc329e74c0..107afa0a5b03 100644 +index a484da1a9c66..29dc20615d36 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -2706,24 +2706,12 @@ int pci_prepare_to_sleep(struct pci_dev *dev) @@ -2086,10 +2086,10 @@ index e137cf15aae9..2ed2341f7967 100755 # Use make KBUILD_ABS_SRCTREE=1 {tags|cscope} # to force full paths for a non-O= build diff --git a/security/integrity/platform_certs/load_uefi.c b/security/integrity/platform_certs/load_uefi.c -index b78753d27d8e..f0b37800431a 100644 +index d1fdd113450a..182e8090cfe8 100644 --- a/security/integrity/platform_certs/load_uefi.c +++ b/security/integrity/platform_certs/load_uefi.c -@@ -73,7 +73,8 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, +@@ -74,7 +74,8 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, return NULL; if (*status != EFI_BUFFER_TOO_SMALL) { @@ -2099,7 +2099,7 @@ index b78753d27d8e..f0b37800431a 100644 return NULL; } -@@ -84,7 +85,8 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, +@@ -85,7 +86,8 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, *status = efi.get_variable(name, guid, NULL, &lsize, db); if (*status != EFI_SUCCESS) { kfree(db); @@ -2162,30 +2162,3 @@ index 4b95de24bc8d..10047790e96e 100644 #ifdef CONFIG_PERF_EVENTS int security_perf_event_open(struct perf_event_attr *attr, int type) { -From 90c4bd0059367922f88768784bfb7c5ec1bc846c Mon Sep 17 00:00:00 2001 -From: "Justin M. Forbes" -Date: Thu, 3 Nov 2022 11:34:03 -0500 -Subject: [PATCH] Revert "disable enum64 BTF in fedora rawhide" - -This option is not supported by older pahole versions. - -This reverts commit 7ab8e0d8b46b7f768e37f8ff39ccae2ecc897396. ---- - scripts/pahole-flags.sh | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/scripts/pahole-flags.sh b/scripts/pahole-flags.sh -index 81c8e082ec57..0d99ef17e4a5 100755 ---- a/scripts/pahole-flags.sh -+++ b/scripts/pahole-flags.sh -@@ -20,7 +20,4 @@ if [ "${pahole_ver}" -ge "122" ]; then - extra_paholeopt="${extra_paholeopt} -j" - fi - --# temporary workaround to disable enum64 --extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_enum64" -- - echo ${extra_paholeopt} --- -2.37.3 - diff --git a/sources b/sources index 8b9a40986..d274c09d8 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.0.17.tar.xz) = 3b7bd3725f0f0c7c6ecfd475bc5f1a3752e05037d6ad303aa6e26dec583d8c651820c60ef1b776bfd3870ecded474386414d08602693f51e6f19e384c717e7b1 -SHA512 (kernel-abi-stablelists-6.0.17.tar.bz2) = 39e80ecc1caeda2e3b05b4c8b54044ec161f2847131cf7123dd125f856bf795676b88417df685b123a80004384f99a460ba2c8e634b6817cd3b22893120d3548 -SHA512 (kernel-kabi-dw-6.0.17.tar.bz2) = cd99b00300b0957b913371e0172d382d13f729df8a54f2961a189aa5c599893895e477cbbbf39d7e1cb6e5ee8920e48dd827186828a4a00e65be84c663adc6ee +SHA512 (linux-6.0.18.tar.xz) = ca37368b99b343a18dedbd733094c7bcd45a3fddc9d048838c7dba7349de5272521fd24638032e69a423f2093efa048e17d09e771e36aca3081825707939c0ca +SHA512 (kernel-abi-stablelists-6.0.18.tar.bz2) = 68e5b410956cdaef4977109dd2077a424b09aa573811db0f9f9118eecb28885ba539907eaa01d36afcd9de042e69c7272af34ab3861df20d5f0fc08ec21f2a2c +SHA512 (kernel-kabi-dw-6.0.18.tar.bz2) = 36f5b8f547e032761014d19803328de2ca119f09882bb71ef9840147890157f1fe10a12645ac5ffd4e713b1417ab66d19b47fcbdfa2623e23559e8c10bb840e0 -- cgit