summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2022-01-29 06:36:21 -0600
committerJustin M. Forbes <jforbes@fedoraproject.org>2022-01-29 06:36:21 -0600
commitec69da7a42b5b7c3da91572ef22097b069ddbd01 (patch)
treeb0c2b1e98084560be21ef73d5f09a9f1601cd28e
parentccc7392df2efccaad1db9dbd6eafedb69d34155a (diff)
downloadkernel-ec69da7a42b5b7c3da91572ef22097b069ddbd01.tar.gz
kernel-ec69da7a42b5b7c3da91572ef22097b069ddbd01.tar.xz
kernel-ec69da7a42b5b7c3da91572ef22097b069ddbd01.zip
kernel-5.15.18-0
* Sat Jan 29 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.15.18-0] - Linux v5.15.18 Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
-rwxr-xr-xkernel.spec11
-rw-r--r--patch-5.15-redhat.patch2
-rw-r--r--sources6
3 files changed, 11 insertions, 8 deletions
diff --git a/kernel.spec b/kernel.spec
index 530476657..52ab8ced0 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -128,7 +128,7 @@ Summary: The Linux kernel
# The kernel tarball/base version
%define kversion 5.15
-%define rpmversion 5.15.17
+%define rpmversion 5.15.18
%define patchversion 5.15
%define pkgrelease 100
@@ -682,7 +682,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.15.17.tar.xz
+Source0: linux-5.15.18.tar.xz
Source1: Makefile.rhelver
@@ -1374,8 +1374,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.15.17 -c
-mv linux-5.15.17 linux-%{KVERREL}
+%setup -q -n kernel-5.15.18 -c
+mv linux-5.15.18 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -2972,6 +2972,9 @@ fi
#
#
%changelog
+* Sat Jan 29 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.15.18-0]
+- Linux v5.15.18 (Justin M. Forbes)
+
* Thu Jan 27 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.15.17-0]
- Revert "PCI/MSI: Mask MSI-X vectors only on success" (Justin M. Forbes)
diff --git a/patch-5.15-redhat.patch b/patch-5.15-redhat.patch
index bf15b1a31..cb1c74f85 100644
--- a/patch-5.15-redhat.patch
+++ b/patch-5.15-redhat.patch
@@ -74,7 +74,7 @@ index 8ff6dafafdf8..e3f786336cf9 100644
This is normally done in pci_enable_device(),
so this option is a temporary workaround
diff --git a/Makefile b/Makefile
-index 088197ed3f66..18279618693d 100644
+index 385286f987d8..7d1852b1edc6 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
diff --git a/sources b/sources
index 0a274fb23..336635f48 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
SHA512 (kernel-abi-whitelists-5.13.19-200.tar.bz2) = 7d28816c431019c9f09b7bcda4eb43ed2c3a7cbb8199af0fecccf16bff3ac992e2c9ed3acc2d06d7c8ebec3dc9ad76d0975cc179d2e4b7541af2af05f7e35de6
-SHA512 (linux-5.15.17.tar.xz) = 113ace76ff678efcf5ddf74faec7a0bdbf18a139f56cf01ad8ca7392727aa9a042da91bd1468ac0ab5e9cb53239b2a2a925f3e24cfa1499906b522d92c9a7468
-SHA512 (kernel-abi-stablelists-5.15.17-100.tar.bz2) = e8b409b5c8f9f574ee31e070ac3de35a660458262b46762578f81fc0f4023ceaba5e37894a4ba656eb00909dc28086cd10f10069f619d1fcd29b7725d4b73558
-SHA512 (kernel-kabi-dw-5.15.17-100.tar.bz2) = 3d6b1a94c79d3ba13a33cb310522e80a5cf27309a457437092e1c5155dfc166b33e09ff1dce1475369b60890db50aec9896f1af9d9b87ff049ea33b5d87f045f
+SHA512 (linux-5.15.18.tar.xz) = df08181c6235faeb1cdec710165dc901b8c5729c51d5f668538ec5c06ac4b297161e83af733069177a3f76133fa15214ba3a4605cb43132c6bd1fe887b6c9be7
+SHA512 (kernel-abi-stablelists-5.15.18-100.tar.bz2) = 8616aa623411ae2cd5b911d7e0cd22971f5eb4540d2bc80f01714f19c87095aabe668cd011eb41c696318b8a05e534028dce6b9a4f1a57f8d66952fa205e1075
+SHA512 (kernel-kabi-dw-5.15.18-100.tar.bz2) = e65ba99a3657ad5976ca81a73f9e7c04a9145de36a693a0aa277a06a8ca0d41315a87f380ca5eeff15b2f3aaf17e969d06b9bda78f5287299d1c3559081fd869