From 40f9235f72d9373de498f2b43e06d4b51a1ca029 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 16 Jun 2022 09:20:11 -0500 Subject: kernel-5.18.5-200 * Thu Jun 16 2022 Justin M. Forbes [5.18.5-0] - Turn E1000 back on correctly (Justin M. Forbes) - Turn E1000 back on (Justin M. Forbes) - Changelog update for rebase (Justin M. Forbes) Resolves: Signed-off-by: Justin M. Forbes --- kernel.spec | 11 ++++++----- patch-5.18-redhat.patch | 2 +- sources | 6 +++--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/kernel.spec b/kernel.spec index 7bea11be8..604cffdf7 100755 --- a/kernel.spec +++ b/kernel.spec @@ -122,15 +122,15 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specversion 5.18.4 +%define specversion 5.18.5 %define patchversion 5.18 -%define pkgrelease 201 +%define pkgrelease 200 %define kversion 5 -%define tarfile_release 5.18.4 +%define tarfile_release 5.18.5 # This is needed to do merge window version magic %define patchlevel 18 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 201%{?buildid}%{?dist} +%define specrelease 200%{?buildid}%{?dist} # # End of genspec.sh variables @@ -3034,7 +3034,8 @@ fi # # %changelog -* Wed Jun 15 2022 Justin M. Forbes [5.18.4-201] +* Thu Jun 16 2022 Justin M. Forbes [5.18.5-0] +- Turn E1000 back on correctly (Justin M. Forbes) - Turn E1000 back on (Justin M. Forbes) - Changelog update for rebase (Justin M. Forbes) diff --git a/patch-5.18-redhat.patch b/patch-5.18-redhat.patch index fdfe61f3c..9d2bd5673 100644 --- a/patch-5.18-redhat.patch +++ b/patch-5.18-redhat.patch @@ -45,7 +45,7 @@ 44 files changed, 716 insertions(+), 195 deletions(-) diff --git a/Makefile b/Makefile -index 6cbf7bb15edd..fcb7fc7a5e81 100644 +index 34bfb76d6333..14b77f963807 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ diff --git a/sources b/sources index e7be0feb4..ca53b9363 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.18.4.tar.xz) = 7dc737b3860331e30dbcddfe8d403d02e00852aa3a70d194947f493035b64390140320f7e98e3148d11fd17535ca2a805209f3aa9eb41de4cbabb1f8f25c0cc3 -SHA512 (kernel-abi-stablelists-5.18.4-201.tar.bz2) = c30d7a4076e4f7f75bbef749f0f2a9fa10e12e031b6cb158cf4c4f9602d3f9119e835bd5ffa21c5286684225d4aaf3c363c080693ce05af58fb952c9dff6eb1e -SHA512 (kernel-kabi-dw-5.18.4-201.tar.bz2) = 5ae0e2b1d33b15ee51798ca965492d5113c1d6906f062424afe1c3aabc9ce784ebfa216a30d246e696cbed60e8358b2ad46dad0080c3eb9d70c3bcb9c0d1d2e3 +SHA512 (linux-5.18.5.tar.xz) = d72e19e50b92cea8eee1ed970bd9cfc5da8b72b2a87a95619d42e43e883acfb6d52008e8e28b5bbdf4bfcc304a5ff3844efb70bd7132976c47df30af9948c38f +SHA512 (kernel-abi-stablelists-5.18.5-200.tar.bz2) = 5df9ad8eaa769abe2150b37497e3f250c4a9e48d290719e3c6b675d6f0b9886af96d5e0bc02d7cd89aa7020b9a10b5e3cd4c01fc294a211ddb108f7f9b66080b +SHA512 (kernel-kabi-dw-5.18.5-200.tar.bz2) = b3678c85276e86bd531b22f7b49154024dd802d9890b5e00b83feb880fcd17dc20ae4e62048c0ed258162ddae735176853acafd7528f8f3a82afa7384913d45c -- cgit