summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2022-06-16 09:20:31 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2022-06-16 09:20:31 -0500
commit30f8e725dff8b602caaf1460d53cef45bece193f (patch)
treee606f40d3fab6da149121cf3f541936d23c37821
parentbd2f1d7e5a96b7b12f1e381ee6ae92a8a6adb913 (diff)
downloadkernel-30f8e725dff8b602caaf1460d53cef45bece193f.tar.gz
kernel-30f8e725dff8b602caaf1460d53cef45bece193f.tar.xz
kernel-30f8e725dff8b602caaf1460d53cef45bece193f.zip
kernel-5.18.5-100
* Thu Jun 16 2022 Justin M. Forbes <jforbes@fedoraproject.org> [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 <jforbes@fedoraproject.org>
-rwxr-xr-xkernel.spec10
-rw-r--r--patch-5.18-redhat.patch2
-rw-r--r--sources6
3 files changed, 9 insertions, 9 deletions
diff --git a/kernel.spec b/kernel.spec
index 072e8bcbe..69e3cba8b 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 101
+%define pkgrelease 100
%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 101%{?buildid}%{?dist}
+%define specrelease 100%{?buildid}%{?dist}
#
# End of genspec.sh variables
@@ -3034,7 +3034,7 @@ fi
#
#
%changelog
-* Wed Jun 15 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.18.4-101]
+* Thu Jun 16 2022 Justin M. Forbes <jforbes@fedoraproject.org> [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 810497147..9c0a1d32d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.18.4.tar.xz) = 7dc737b3860331e30dbcddfe8d403d02e00852aa3a70d194947f493035b64390140320f7e98e3148d11fd17535ca2a805209f3aa9eb41de4cbabb1f8f25c0cc3
-SHA512 (kernel-abi-stablelists-5.18.4-101.tar.bz2) = 39ef9e91d159bc88520a7b4ac150be33d8170b4980f1ef420837d1009fe1245e1cd9f19264a5caaa7b114069b49c7d997f74262ab0523e92ef0a8725d349b06f
-SHA512 (kernel-kabi-dw-5.18.4-101.tar.bz2) = 5ae0e2b1d33b15ee51798ca965492d5113c1d6906f062424afe1c3aabc9ce784ebfa216a30d246e696cbed60e8358b2ad46dad0080c3eb9d70c3bcb9c0d1d2e3
+SHA512 (linux-5.18.5.tar.xz) = d72e19e50b92cea8eee1ed970bd9cfc5da8b72b2a87a95619d42e43e883acfb6d52008e8e28b5bbdf4bfcc304a5ff3844efb70bd7132976c47df30af9948c38f
+SHA512 (kernel-abi-stablelists-5.18.5-100.tar.bz2) = e0ed7276403f01fca4c6bfd4782daddd442cf72f40348a7ebbfaf40c59d963c6b79171dfe21005a6f39e44bea3176d60cfed6bae6a3a1065ab1fd0e31a7cfbcc
+SHA512 (kernel-kabi-dw-5.18.5-100.tar.bz2) = b3678c85276e86bd531b22f7b49154024dd802d9890b5e00b83feb880fcd17dc20ae4e62048c0ed258162ddae735176853acafd7528f8f3a82afa7384913d45c