diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-07-08 19:32:07 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-07-08 19:32:07 +0200 |
commit | eba7d0a2b73bc65ea1cc1efd6d63675272a189be (patch) | |
tree | 9951a0559040bdca1e9892b2af2859c007958f4f /0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch | |
parent | f74174ce806f67006fc43d0822e891966702d82c (diff) | |
parent | a6d0f2858ff60881f95ba4f610089b8b7778d671 (diff) | |
download | kernel-eba7d0a2b73bc65ea1cc1efd6d63675272a189be.tar.gz kernel-eba7d0a2b73bc65ea1cc1efd6d63675272a189be.tar.xz kernel-eba7d0a2b73bc65ea1cc1efd6d63675272a189be.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc4.20200708gitdcde237b9b0e.1.vanilla.1.fc32
Diffstat (limited to '0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch')
-rw-r--r-- | 0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch b/0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch index 0b2bae28d..63cd86b35 100644 --- a/0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch +++ b/0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch @@ -41,7 +41,7 @@ index 90a2a17239b0..be3b72c53656 100644 + return !!ipl_secure_flag; +} diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c -index 5853c9872dfe..fab9bc9889da 100644 +index 07aa15ba43b3..307abb2d82d7 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -49,6 +49,7 @@ |