diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-07-13 19:13:24 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-07-13 19:13:24 +0200 |
commit | fda836ec43c28561c5521309060648d2e67239e8 (patch) | |
tree | da0abeb4b963206fc5154a7d98e299906f17608e /0001-Drop-that-for-now.patch | |
parent | e35e769d8cb3726d2e5a009d4223037ba45a5157 (diff) | |
parent | aa5ab7f890a036ab6802c7a0c8cf8459a324e3c2 (diff) | |
download | kernel-fda836ec43c28561c5521309060648d2e67239e8.tar.gz kernel-fda836ec43c28561c5521309060648d2e67239e8.tar.xz kernel-fda836ec43c28561c5521309060648d2e67239e8.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc5.1.vanilla.1.fc33kernel-5.8.0-0.rc5.1.vanilla.1.fc32kernel-5.8.0-0.rc5.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 178e27e1a..233c6ddad 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 45081a0c4dcc..d22698a301b9 100644 +index 09639e0e075f..8c072a1954cb 100644 --- a/Makefile +++ b/Makefile @@ -496,7 +496,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE |