summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2023-02-01 09:23:32 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2023-02-01 09:23:32 +0100
commit643e9d4198fee2bc4e305adedc794f93ba0baf72 (patch)
tree35e417d37f32d2bce09890daf45a65d125b40ba4
parent4f03cc660ca6ccb17b918c2d17c9fec62f73c290 (diff)
parentccf31ec1913e2bb786d56cce5d3aa5e3d36563ba (diff)
downloadkernel-643e9d4198fee2bc4e305adedc794f93ba0baf72.tar.gz
kernel-643e9d4198fee2bc4e305adedc794f93ba0baf72.tar.xz
kernel-643e9d4198fee2bc4e305adedc794f93ba0baf72.zip
Merge remote-tracking branch 'origin/f36' into f36-user-thl-vanilla-fedora
-rwxr-xr-xkernel.spec5
-rw-r--r--patch-6.1-redhat.patch6
-rw-r--r--sources6
3 files changed, 10 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec
index 45647f896..ed71f0d90 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -138,7 +138,7 @@ Summary: The Linux kernel
# This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 150%{?buildid}%{?dist}
# This defines the kabi tarball version
-%define kabiversion 6.1.7
+%define kabiversion 6.1.8
# If this variable is set to 1, a bpf selftests build failure will cause a
# fatal kernel package build error
@@ -3184,6 +3184,9 @@ fi
#
#
%changelog
+* Tue Jan 24 2023 Augusto Caringi <acaringi@redhat.com> [6.1.8-0]
+- Linux v6.1.8
+
* Wed Jan 18 2023 Augusto Caringi <acaringi@redhat.com> [6.1.7-0]
- enable efifb for Nvidia (Justin M. Forbes)
- Linux v6.1.7
diff --git a/patch-6.1-redhat.patch b/patch-6.1-redhat.patch
index 761ae0d03..38e46552e 100644
--- a/patch-6.1-redhat.patch
+++ b/patch-6.1-redhat.patch
@@ -39,7 +39,7 @@
38 files changed, 484 insertions(+), 180 deletions(-)
diff --git a/Makefile b/Makefile
-index 7eb6793ecfbf..c7e8be8b3a5f 100644
+index 49261450039a..b077c86bcb5f 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -1053,10 +1053,10 @@ index 285acc4aaccc..a7056957e7dd 100644
* Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero)
* class code. Fix it.
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index bbab424b0d55..ed86042fb57b 100644
+index 0aaaadb02cc6..a5f68eae241a 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
-@@ -5676,6 +5676,13 @@ static void hub_event(struct work_struct *work)
+@@ -5679,6 +5679,13 @@ static void hub_event(struct work_struct *work)
(u16) hub->change_bits[0],
(u16) hub->event_bits[0]);
diff --git a/sources b/sources
index c2192cbde..28e784e9f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.1.7.tar.xz) = a20e1c02b804aa367ca78a2c946c925ebd97b0f3394d1d68505772c20bd6df45c72bd68b59ba3ef9fe3dc4064107c42aaa9bfd6d0b87e6904114e21f146802c4
-SHA512 (kernel-abi-stablelists-6.1.7.tar.bz2) = 6f3107b91a36a81aa68fcb27816ccd4a71ffd17cbc9895d48c5101e1f8732cfbdd8cdbf69579c5cada3dda33fe93c0b2f1bd5b24f8ae15d1b10625a1ea2c0536
-SHA512 (kernel-kabi-dw-6.1.7.tar.bz2) = 003aecf4b780305b720d002c0250ab74c70f575c2abe57cf5a5648a73f5ff954e68ba6d486fda770a1ea9d3e97563fd8900b063d2957e947d60ec00ef39a2851
+SHA512 (linux-6.1.8.tar.xz) = 3774c7f2851c9a7c682fa7a0466f4444f28e10d4a92a350b6e1b1899498e17d40e96f2684be6111652723c467123b0f42f8a1d3586232cd5b309414d9e6dc5a9
+SHA512 (kernel-abi-stablelists-6.1.8.tar.bz2) = 2432d9932077f86d902b23fd85b5af8b8577762d33402cc6a4b3060cb0b87f84482a27c158bed3e9dc5ff4ff86723dde46c9515e46f407345cd4247fbe320f08
+SHA512 (kernel-kabi-dw-6.1.8.tar.bz2) = bc53492fb555327ec0622c05156b272d572962a357085b3a88cb8d1e3b6685424616009de8e9d5b19ffeaa159d33db4036d049bee8f9ae669a5c52e2c797ee07