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-add-support-for-crashkernel-auto.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-add-support-for-crashkernel-auto.patch')
| -rw-r--r-- | 0001-kdump-add-support-for-crashkernel-auto.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-kdump-add-support-for-crashkernel-auto.patch b/0001-kdump-add-support-for-crashkernel-auto.patch index 0cb1da786..8bb55fd3c 100644 --- a/0001-kdump-add-support-for-crashkernel-auto.patch +++ b/0001-kdump-add-support-for-crashkernel-auto.patch @@ -160,10 +160,10 @@ index 2da65fef2a1c..d53a524f80f0 100644 Boot into System Kernel diff --git a/kernel/crash_core.c b/kernel/crash_core.c -index 0b3f738178b8..a04650f7f6c2 100644 +index e4dfe2a05a31..8c6f59932247 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c -@@ -260,6 +260,20 @@ static int __init __parse_crashkernel(char *cmdline, +@@ -258,6 +258,20 @@ static int __init __parse_crashkernel(char *cmdline, if (suffix) return parse_crashkernel_suffix(ck_cmdline, crash_size, suffix); |