diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-17 18:21:30 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-17 18:21:30 +0200 |
commit | 9d8cc94b05933f016a226898842277611bafd566 (patch) | |
tree | 44bd1fc40427c8d932bb2d5bcac9f86b3b1feedc /0001-Drop-that-for-now.patch | |
parent | 6243c80866b326be88265a9756403a577110d2d9 (diff) | |
parent | fa13b59d638eb5dd773694de898e8f99d1d85526 (diff) | |
download | kernel-9d8cc94b05933f016a226898842277611bafd566.tar.gz kernel-9d8cc94b05933f016a226898842277611bafd566.tar.xz kernel-9d8cc94b05933f016a226898842277611bafd566.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc1.1.vanilla.1.fc34kernel-5.9.0-0.rc1.1.vanilla.1.fc33kernel-5.9.0-0.rc1.1.vanilla.1.fc32kernel-5.9.0-0.rc1.1.vanilla.1.fc31
Diffstat (limited to '0001-Drop-that-for-now.patch')
-rw-r--r-- | 0001-Drop-that-for-now.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/0001-Drop-that-for-now.patch b/0001-Drop-that-for-now.patch index 2d945f71d..0310d4652 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 7542f496ff1e..0eb0eb74f883 100644 +index 1434a354290f..9c0083343ea1 100644 --- a/Makefile +++ b/Makefile @@ -498,7 +498,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE |