diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-09-05 11:03:16 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-09-05 11:03:16 +0200 |
| commit | f3ab93fe13027d2bfeaa0d69c382f0901fff814f (patch) | |
| tree | 1836611ec25ec37a4de0eeff9f84ad58099ef03a /patch-6.0-redhat.patch | |
| parent | bf4688151f99adc8ec54d49b41eae1c573cb5dd5 (diff) | |
| parent | 26518b2cca22452e05e13386e82c7b0fc977535d (diff) | |
| download | kernel-f3ab93fe13027d2bfeaa0d69c382f0901fff814f.tar.gz kernel-f3ab93fe13027d2bfeaa0d69c382f0901fff814f.tar.xz kernel-f3ab93fe13027d2bfeaa0d69c382f0901fff814f.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.0.0-0.rc4.31.vanilla.1.fc38kernel-6.0.0-0.rc4.31.vanilla.1.fc37kernel-6.0.0-0.rc4.31.vanilla.1.fc36kernel-6.0.0-0.rc4.31.vanilla.1.fc35
Diffstat (limited to 'patch-6.0-redhat.patch')
| -rw-r--r-- | patch-6.0-redhat.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patch-6.0-redhat.patch b/patch-6.0-redhat.patch index fdb50bd67..293931cc8 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 952d354069a4..91c24008b37f 100644 +index a4f71076cacb..a6f13827b133 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 2633acde7ac1..665b8a441b0a 100644 +index d4b1e70d1498..bb2cc1dfb22e 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) |