diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-09-09 19:50:26 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-09-09 19:50:26 +0200 |
| commit | 3768a3fdd59fa3c24dd831650246756e98e6abd8 (patch) | |
| tree | 9a833bbcfb36e0c03fcc0af1f6be4600f2898ee1 /0001-Drop-that-for-now.patch | |
| parent | b6b340036ca5fa42c54175741bf8821e2fc8ef47 (diff) | |
| parent | 9f7f1a167a403e73b72db3ac12baf0bdda803259 (diff) | |
| download | kernel-3768a3fdd59fa3c24dd831650246756e98e6abd8.tar.gz kernel-3768a3fdd59fa3c24dd831650246756e98e6abd8.tar.xz kernel-3768a3fdd59fa3c24dd831650246756e98e6abd8.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc4.20200909git34d4ddd359db.6.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 0b9a0a31f..e0db8f5a9 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 33c63014f15a..0cc2def5e1c5 100644 +index 0b3f5f551acb..eb3329583d82 100644 --- a/Makefile +++ b/Makefile @@ -497,7 +497,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE @@ -21,5 +21,5 @@ index 33c63014f15a..0cc2def5e1c5 100644 KBUILD_CPPFLAGS := -D__KERNEL__ KBUILD_AFLAGS_KERNEL := -- -2.26.2 +2.28.0 |