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-kdump-fix-a-grammar-issue-in-a-kernel-message.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-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 720ea3439..78f372150 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 a04650f7f6c2..09a4870fe1fb 100644 +index 8c6f59932247..598d8324f51a 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c -@@ -271,7 +271,7 @@ static int __init __parse_crashkernel(char *cmdline, +@@ -269,7 +269,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 |