diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-22 17:11:35 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-22 17:11:35 +0200 |
commit | 7cea9df3ee02b4675250301b5ba161abdd83a175 (patch) | |
tree | c736bc0aa41ba346bc5863c4328edbf9ec89e638 /0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch | |
parent | 268fd48fcb2ea8b2a0fac8148fa6df88fa43bc43 (diff) | |
parent | 57c10c22cb2ca4c2a97f071a94995955c62b05b0 (diff) | |
download | kernel-7cea9df3ee02b4675250301b5ba161abdd83a175.tar.gz kernel-7cea9df3ee02b4675250301b5ba161abdd83a175.tar.xz kernel-7cea9df3ee02b4675250301b5ba161abdd83a175.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc2.20200622git625d3449788f.1.vanilla.1.fc33kernel-5.8.0-0.rc2.20200622git625d3449788f.1.vanilla.1.fc32kernel-5.8.0-0.rc2.20200622git625d3449788f.1.vanilla.1.fc31
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 dd90c0420..0b2bae28d 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 @@ -28,7 +28,7 @@ index 7d5cfdda5277..be66ee5d0437 100644 /* * DIAG 308 support diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c -index ccea9a245867..558f9fbfd114 100644 +index 90a2a17239b0..be3b72c53656 100644 --- a/arch/s390/kernel/ipl.c +++ b/arch/s390/kernel/ipl.c @@ -2110,3 +2110,8 @@ int ipl_report_free(struct ipl_report *report) |