summaryrefslogtreecommitdiffstats
path: root/patch-5.15-redhat.patch
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-12-15 05:19:56 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2021-12-15 05:19:56 +0100
commit44cfccbf0a6c7265925bc39546fb5d70583a2f41 (patch)
tree157e36977d57f02ab0e827a44bbdf57519ea8532 /patch-5.15-redhat.patch
parentfd47246886a4fe3ce181e711b770da56d6c6b464 (diff)
parente68c5cb010a63cb314f977f23a4bd7b4ef6ccff4 (diff)
downloadkernel-44cfccbf0a6c7265925bc39546fb5d70583a2f41.tar.gz
kernel-44cfccbf0a6c7265925bc39546fb5d70583a2f41.tar.xz
kernel-44cfccbf0a6c7265925bc39546fb5d70583a2f41.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 60d2bf873..6a71c1927 100644
--- a/patch-5.15-redhat.patch
+++ b/patch-5.15-redhat.patch
@@ -69,7 +69,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 2d85216b1493..6c9277288453 100644
+index 72344b214bba..efa8577eb3fa 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \