diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2023-01-12 12:45:53 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2023-01-12 12:45:53 +0100 |
| commit | 718d20bb0f93750505f4453f613efe646683a63a (patch) | |
| tree | 49923e689365dbc1ebb72da2cf460446b61c0f0e | |
| parent | 9adf993d32a1056af1fd03f064a5035aabddc34b (diff) | |
| parent | 62972655842c19f11a19c3adcc8f646247f91219 (diff) | |
| download | kernel-718d20bb0f93750505f4453f613efe646683a63a.tar.gz kernel-718d20bb0f93750505f4453f613efe646683a63a.tar.xz kernel-718d20bb0f93750505f4453f613efe646683a63a.zip | |
Merge remote-tracking branch 'origin/f37' into f37-user-thl-vanilla-fedora
| -rwxr-xr-x | kernel.spec | 5 | ||||
| -rw-r--r-- | patch-6.0-redhat.patch | 14 | ||||
| -rw-r--r-- | sources | 6 |
3 files changed, 14 insertions, 11 deletions
diff --git a/kernel.spec b/kernel.spec index ce459a1bc..af368cb4b 100755 --- a/kernel.spec +++ b/kernel.spec @@ -136,7 +136,7 @@ Summary: The Linux kernel # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 350%{?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 @@ -3186,6 +3186,9 @@ fi # # %changelog +* Sat Jan 07 2023 Justin M. Forbes <jforbes@fedoraproject.org> [6.0.18-0] +- Linux v6.0.18 + * Wed Jan 04 2023 Justin M. Forbes <jforbes@fedoraproject.org> [6.0.17-0] - Linux v6.0.17 diff --git a/patch-6.0-redhat.patch b/patch-6.0-redhat.patch index 53cb7102a..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 <linux/delay.h> #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); @@ -1,3 +1,3 @@ -SHA512 (linux-6.0.17.tar.xz) = 3b7bd3725f0f0c7c6ecfd475bc5f1a3752e05037d6ad303aa6e26dec583d8c651820c60ef1b776bfd3870ecded474386414d08602693f51e6f19e384c717e7b1 -SHA512 (kernel-abi-stablelists-6.0.17.tar.bz2) = 699a21720eeaef7fc7ac13f10c8e3beb26d15d5452170813d5b468e53c4327029498755b300c76b4029746d1f9ad45591a7235a795b55f3d9052b721dd9aee53 -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) = 3b9af951923a9c75d17a7b30778874924551924deb0a13d3ad61eaf2c190e31c6d17dcbcecf782b2b1a50563b932960c81e59eddbe4dd7f96558a20b524fe078 +SHA512 (kernel-kabi-dw-6.0.18.tar.bz2) = 36f5b8f547e032761014d19803328de2ca119f09882bb71ef9840147890157f1fe10a12645ac5ffd4e713b1417ab66d19b47fcbdfa2623e23559e8c10bb840e0 |