diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-27 05:55:52 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-27 05:55:52 +0200 |
| commit | f7ba01a9677fffa21535bc6cdcad930a858d6106 (patch) | |
| tree | 6eb6df39221f8926b813d63b41ffed9da18e6a5d /0001-Drop-that-for-now.patch | |
| parent | 837cd03f031f1daaa2dda23d584cda25b0dfd51e (diff) | |
| parent | 6c2cc50051831fa502a8b082a312ca90e7039f3f (diff) | |
| download | kernel-f7ba01a9677fffa21535bc6cdcad930a858d6106.tar.gz kernel-f7ba01a9677fffa21535bc6cdcad930a858d6106.tar.xz kernel-f7ba01a9677fffa21535bc6cdcad930a858d6106.zip | |
merge masterkernel-5.7.0-0.rc3.1.vanilla.1.fc33kernel-5.7.0-0.rc3.1.vanilla.1.fc32kernel-5.7.0-0.rc3.1.vanilla.1.fc31kernel-5.7.0-0.rc3.1.vanilla.1.fc30
Diffstat (limited to '0001-Drop-that-for-now.patch')
| -rw-r--r-- | 0001-Drop-that-for-now.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/0001-Drop-that-for-now.patch b/0001-Drop-that-for-now.patch index c991817e3..5d9516142 100644 --- a/0001-Drop-that-for-now.patch +++ b/0001-Drop-that-for-now.patch @@ -1,4 +1,4 @@ -From 0791d647272fa837cad2ac55ab8d8294d2dffda7 Mon Sep 17 00:00:00 2001 +From f418b6ef99df7328b95d5bc578f6d82e5b640e9a Mon Sep 17 00:00:00 2001 From: Laura Abbott <labbott@redhat.com> Date: Wed, 23 Jan 2019 14:36:37 +0100 Subject: [PATCH] Drop that for now @@ -8,7 +8,7 @@ Subject: [PATCH] Drop that for now 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 0808100e660f..15a5cdd01839 100644 +index 57e5c3262659..956c3d12289e 100644 --- a/Makefile +++ b/Makefile @@ -479,7 +479,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE @@ -21,5 +21,5 @@ index 0808100e660f..15a5cdd01839 100644 KBUILD_CPPFLAGS := -D__KERNEL__ KBUILD_AFLAGS_KERNEL := -- -2.26.0 +2.26.2 |