diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-13 20:17:57 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-13 20:17:57 +0200 |
commit | f05c02032c007399078784ea2ace322385f869b9 (patch) | |
tree | 7c1bd28f37be1d28a3c8ace051c55472ba8bdd63 /0001-kdump-fix-a-grammar-issue-in-a-kernel-message.patch | |
parent | 55576abe986db86a9f4e2b105d2451800d652217 (diff) | |
parent | f7a3bf654752fa0e92c7ab3e57e48d3415632852 (diff) | |
download | kernel-f05c02032c007399078784ea2ace322385f869b9.tar.gz kernel-f05c02032c007399078784ea2ace322385f869b9.tar.xz kernel-f05c02032c007399078784ea2ace322385f869b9.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to '0001-kdump-fix-a-grammar-issue-in-a-kernel-message.patch')
-rw-r--r-- | 0001-kdump-fix-a-grammar-issue-in-a-kernel-message.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-kdump-fix-a-grammar-issue-in-a-kernel-message.patch b/0001-kdump-fix-a-grammar-issue-in-a-kernel-message.patch index 5444af2e6..f4c7d02fe 100644 --- a/0001-kdump-fix-a-grammar-issue-in-a-kernel-message.patch +++ b/0001-kdump-fix-a-grammar-issue-in-a-kernel-message.patch @@ -26,10 +26,10 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/crash_core.c b/kernel/crash_core.c -index c252221b2f4b..df551fc9034c 100644 +index a04650f7f6c2..09a4870fe1fb 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c -@@ -269,7 +269,7 @@ static int __init __parse_crashkernel(char *cmdline, +@@ -271,7 +271,7 @@ static int __init __parse_crashkernel(char *cmdline, #elif defined(CONFIG_PPC64) ck_cmdline = "2G-4G:384M,4G-16G:512M,16G-64G:1G,64G-128G:2G,128G-:4G"; #endif |