diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-09-30 18:44:02 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-09-30 18:44:02 +0200 |
commit | e5237f62c21f764ed70f1abcea884b15f30ca984 (patch) | |
tree | 30612d7f7dcef570d7f4f5dabbec7d246b6da140 /0001-Drop-that-for-now.patch | |
parent | e3fcce771836f3bf4ad59b6beed900b3e9a25ea0 (diff) | |
parent | 8bf7e7fde6b9176ccaac91a0c95464f326d8a008 (diff) | |
download | kernel-e5237f62c21f764ed70f1abcea884b15f30ca984.tar.gz kernel-e5237f62c21f764ed70f1abcea884b15f30ca984.tar.xz kernel-e5237f62c21f764ed70f1abcea884b15f30ca984.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc7.20200930gitfb0155a09b02.22.vanilla.1.fc32
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 3dcd928eb..8b813bfa6 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 53bbe4be5a69..9d060d6f3037 100644 +index b70997f7ddf9..680d906eee35 100644 --- a/Makefile +++ b/Makefile -@@ -497,7 +497,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE +@@ -498,7 +498,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 \ |