aboutsummaryrefslogtreecommitdiff
path: root/SOURCES/patch-5.15-redhat.patch
diff options
context:
space:
mode:
Diffstat (limited to 'SOURCES/patch-5.15-redhat.patch')
-rw-r--r--SOURCES/patch-5.15-redhat.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/SOURCES/patch-5.15-redhat.patch b/SOURCES/patch-5.15-redhat.patch
index 1878813..f50f305 100644
--- a/SOURCES/patch-5.15-redhat.patch
+++ b/SOURCES/patch-5.15-redhat.patch
@@ -51,10 +51,10 @@
50 files changed, 753 insertions(+), 202 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index a454f438bd62..d00009504c94 100644
+index 8ff6dafafdf8..e3f786336cf9 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -3953,6 +3953,15 @@
+@@ -3955,6 +3955,15 @@
please report a bug.
nocrs [X86] Ignore PCI host bridge windows from ACPI.
If you need to use this, please report a bug.
@@ -71,7 +71,7 @@ index a454f438bd62..d00009504c94 100644
This is normally done in pci_enable_device(),
so this option is a temporary workaround
diff --git a/Makefile b/Makefile
-index 474b2a2292ca..22cae212633b 100644
+index 0964b940b889..717685ccae64 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -1684,7 +1684,7 @@ index 00070a8a6507..e9e0ffa990cd 100644
* disconnected while waiting for the lock to succeed. */
usb_lock_device(hdev);
diff --git a/include/linux/efi.h b/include/linux/efi.h
-index 6b5d36babfcc..fd4a5d66a9d0 100644
+index 3d8ddc5eca8c..779f41901f35 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -43,6 +43,8 @@