summaryrefslogtreecommitdiffstats
path: root/patch-6.0-redhat.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2022-09-26 08:38:46 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2022-09-26 08:38:46 -0500
commit55694672a3379ff519af80dfb3de2e923f45b2d8 (patch)
tree58a0e4bcc26b89f0b2d1be4af2dd726a698fa2de /patch-6.0-redhat.patch
parentabd9896879c39c68dd750f7262f5d8cc2a3cdd95 (diff)
downloadkernel-55694672a3379ff519af80dfb3de2e923f45b2d8.tar.gz
kernel-55694672a3379ff519af80dfb3de2e923f45b2d8.tar.xz
kernel-55694672a3379ff519af80dfb3de2e923f45b2d8.zip
kernel-6.0.0-0.rc7.47
* Mon Sep 26 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.0.0-0.rc7.47] - all: cleanup dell config options (Peter Robinson) - redhat: Include more kunit tests (Nico Pache) - common: some minor cleanups/de-dupe (Peter Robinson) - common: enable INTEGRITY_MACHINE_KEYRING on all configuraitons (Peter Robinson) - Linux v6.0.0-0.rc7 Resolves: Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'patch-6.0-redhat.patch')
-rw-r--r--patch-6.0-redhat.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patch-6.0-redhat.patch b/patch-6.0-redhat.patch
index 2dcff6388..3b54785c3 100644
--- a/patch-6.0-redhat.patch
+++ b/patch-6.0-redhat.patch
@@ -121,7 +121,7 @@ index 000000000000..effb81d04bfd
+
+endmenu
diff --git a/Makefile b/Makefile
-index 298f69060f10..f53ee2cad1f8 100644
+index 647a42a1f800..769b7c25a6a9 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -1767,7 +1767,7 @@ index 9e849f6b0d0f..00f9a1303b93 100644
};
MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl);
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index d4b1e70d1498..bb2cc1dfb22e 100644
+index bbab424b0d55..ed86042fb57b 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)