diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-24 16:26:27 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-24 16:26:27 +0200 |
commit | 3e69d0c28fcf4dae0d7996b65e1849ef0d0da70e (patch) | |
tree | f49795de3f8aaae86e73f6a1f21b7b1948048311 /0001-Drop-that-for-now.patch | |
parent | c01e23554af1d0635829396c9b8b7f5040a2d7d3 (diff) | |
parent | 427e0b0cd9f365866f7b2517c77ed712f5df9cc7 (diff) | |
download | kernel-3e69d0c28fcf4dae0d7996b65e1849ef0d0da70e.tar.gz kernel-3e69d0c28fcf4dae0d7996b65e1849ef0d0da70e.tar.xz kernel-3e69d0c28fcf4dae0d7996b65e1849ef0d0da70e.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc2.1.vanilla.2.fc34kernel-5.9.0-0.rc2.1.vanilla.2.fc33kernel-5.9.0-0.rc2.1.vanilla.2.fc32kernel-5.9.0-0.rc2.1.vanilla.2.fc31
Diffstat (limited to '0001-Drop-that-for-now.patch')
-rw-r--r-- | 0001-Drop-that-for-now.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-Drop-that-for-now.patch b/0001-Drop-that-for-now.patch index 0310d4652..37f8356ee 100644 --- a/0001-Drop-that-for-now.patch +++ b/0001-Drop-that-for-now.patch @@ -8,10 +8,10 @@ Subject: [PATCH] Drop that for now 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 1434a354290f..9c0083343ea1 100644 +index 83033334b565..824e2caf4067 100644 --- a/Makefile +++ b/Makefile -@@ -498,7 +498,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE +@@ -497,7 +497,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE KBUILD_CFLAGS := -Wall -Wundef -Werror=strict-prototypes -Wno-trigraphs \ -fno-strict-aliasing -fno-common -fshort-wchar -fno-PIE \ -Werror=implicit-function-declaration -Werror=implicit-int \ |