summaryrefslogtreecommitdiffstats
path: root/0001-Drop-that-for-now.patch
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-07-06 17:45:02 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-07-06 17:45:02 +0200
commitf74174ce806f67006fc43d0822e891966702d82c (patch)
treef9a84a9572ea072114db111d94f27689672076e8 /0001-Drop-that-for-now.patch
parent40b690d3b5b8bb7bb32ad27cd325c0cbb60d5352 (diff)
parent358c00f77ff317634027eb4ac228be1df3632c44 (diff)
downloadkernel-f74174ce806f67006fc43d0822e891966702d82c.tar.gz
kernel-f74174ce806f67006fc43d0822e891966702d82c.tar.xz
kernel-f74174ce806f67006fc43d0822e891966702d82c.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc4.1.vanilla.1.fc33kernel-5.8.0-0.rc4.1.vanilla.1.fc32kernel-5.8.0-0.rc4.1.vanilla.1.fc31
Diffstat (limited to '0001-Drop-that-for-now.patch')
-rw-r--r--0001-Drop-that-for-now.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/0001-Drop-that-for-now.patch b/0001-Drop-that-for-now.patch
index 42e8f7793..178e27e1a 100644
--- a/0001-Drop-that-for-now.patch
+++ b/0001-Drop-that-for-now.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] Drop that for now
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index a3ec72fe1d8a..8dd82ad14236 100644
+index 45081a0c4dcc..d22698a301b9 100644
--- a/Makefile
+++ b/Makefile
@@ -496,7 +496,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE