summaryrefslogtreecommitdiffstats
path: root/patch-5.15-redhat.patch
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-12-15 05:19:58 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2021-12-15 05:19:58 +0100
commit53834cd95a339ff2b51776fd30a7ca9b9b6ef554 (patch)
tree73a007b452e1ec1dbc094c8713752d4d7a4b53b8 /patch-5.15-redhat.patch
parent5f841b0184162d75037f0ea1f74ba7b1a9a5ce8e (diff)
parent3a2de6daf1a9a25a78175aa1411439ce5ccf95b9 (diff)
downloadkernel-53834cd95a339ff2b51776fd30a7ca9b9b6ef554.tar.gz
kernel-53834cd95a339ff2b51776fd30a7ca9b9b6ef554.tar.xz
kernel-53834cd95a339ff2b51776fd30a7ca9b9b6ef554.zip
Merge remote-tracking branch 'origin/f34' into f34-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)), \