diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2023-01-20 21:50:34 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2023-01-20 21:50:34 +0100 |
commit | 82503a97e104b12a9387f73def856c8c8a483c30 (patch) | |
tree | 03060045f0ccdd27261401a9e94cd9eb2dc9be50 /patch-6.2-redhat.patch | |
parent | a3cc134350712c8619bb97e4c55094dd0134118b (diff) | |
parent | 71f8956c7f136d8522ffa50143cbfb94266e39cb (diff) | |
download | kernel-82503a97e104b12a9387f73def856c8c8a483c30.tar.gz kernel-82503a97e104b12a9387f73def856c8c8a483c30.tar.xz kernel-82503a97e104b12a9387f73def856c8c8a483c30.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.2.0-0.rc4.20230120gitd368967cb103.35.vanilla.1.fc38kernel-6.2.0-0.rc4.20230120gitd368967cb103.35.vanilla.1.fc37kernel-6.2.0-0.rc4.20230120gitd368967cb103.35.vanilla.1.fc36
Diffstat (limited to 'patch-6.2-redhat.patch')
-rw-r--r-- | patch-6.2-redhat.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch index fa19ab9fd..c1c46ec85 100644 --- a/patch-6.2-redhat.patch +++ b/patch-6.2-redhat.patch @@ -228,7 +228,7 @@ index fbd646dbf440..23ca9cdb2438 100644 + return !!ipl_secure_flag; +} diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c -index 2b6091349daa..b9eafa68df6e 100644 +index 696c9e007a36..80a56c8eaaae 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -49,6 +49,7 @@ @@ -239,7 +239,7 @@ index 2b6091349daa..b9eafa68df6e 100644 #include <linux/hugetlb.h> #include <linux/kmemleak.h> -@@ -980,6 +981,9 @@ void __init setup_arch(char **cmdline_p) +@@ -981,6 +982,9 @@ void __init setup_arch(char **cmdline_p) log_component_list(); |