summaryrefslogtreecommitdiffstats
path: root/patch-5.15-redhat.patch
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-12-22 19:30:44 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2021-12-22 19:30:44 +0100
commit44633042c3f36d9347e9e66d062a97357c5a3e4c (patch)
tree89526d8bf7d70e4758a80c31bc0a462dbb3ffdf2 /patch-5.15-redhat.patch
parent8c65fa6151dffca50f3915f0aa1ea6d75c23f6e2 (diff)
parent8c0f76826ff3643ac90bfa8f27bd0470eec44dd0 (diff)
downloadkernel-44633042c3f36d9347e9e66d062a97357c5a3e4c.tar.gz
kernel-44633042c3f36d9347e9e66d062a97357c5a3e4c.tar.xz
kernel-44633042c3f36d9347e9e66d062a97357c5a3e4c.zip
Merge remote-tracking branch 'origin/f35' into f35-user-thl-vanilla-fedora
Diffstat (limited to 'patch-5.15-redhat.patch')
-rw-r--r--patch-5.15-redhat.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/patch-5.15-redhat.patch b/patch-5.15-redhat.patch
index 18d479dec..358786b5b 100644
--- a/patch-5.15-redhat.patch
+++ b/patch-5.15-redhat.patch
@@ -70,7 +70,7 @@ index 1396fd2d9031..4bc97128cee8 100644
This is normally done in pci_enable_device(),
so this option is a temporary workaround
diff --git a/Makefile b/Makefile
-index d5e266291e5d..081570eb866b 100644
+index 37a1144c32df..71ebb01b9baa 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \