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-add-support-for-crashkernel-auto.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-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 115110146..54fc3df9b 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 d631d22089ba..c252221b2f4b 100644 +index 0b3f738178b8..a04650f7f6c2 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c -@@ -258,6 +258,20 @@ static int __init __parse_crashkernel(char *cmdline, +@@ -260,6 +260,20 @@ static int __init __parse_crashkernel(char *cmdline, if (suffix) return parse_crashkernel_suffix(ck_cmdline, crash_size, suffix); |