summaryrefslogtreecommitdiffstats
path: root/patch-5.12-redhat.patch
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-06-03 09:30:45 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2021-06-03 09:30:45 +0200
commit184c17d608ada230f9c46175144baea7c146d43c (patch)
tree84086f13b2e30b17eb872d1e2d928e6eabcdf91d /patch-5.12-redhat.patch
parent83eb07be6d85ef374a8382657eed522caf21d8a0 (diff)
parente9f6f85d8807e487e9d8154dee4f39d353115612 (diff)
downloadkernel-184c17d608ada230f9c46175144baea7c146d43c.tar.gz
kernel-184c17d608ada230f9c46175144baea7c146d43c.tar.xz
kernel-184c17d608ada230f9c46175144baea7c146d43c.zip
Merge remote-tracking branch 'origin/f34' into f34-user-thl-vanilla-fedora
Diffstat (limited to 'patch-5.12-redhat.patch')
-rw-r--r--patch-5.12-redhat.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/patch-5.12-redhat.patch b/patch-5.12-redhat.patch
index 8392e6139..0b95ed537 100644
--- a/patch-5.12-redhat.patch
+++ b/patch-5.12-redhat.patch
@@ -65,7 +65,7 @@ index 75a9dd98e76e..3ff3291551f9 100644
Boot into System Kernel
diff --git a/Makefile b/Makefile
-index 6a73dee7c221..585dfe88d94c 100644
+index a20afcb7d2bf..a19908237e8a 100644
--- a/Makefile
+++ b/Makefile
@@ -495,6 +495,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE