diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-02 21:01:33 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-02 21:01:33 +0200 |
| commit | 02ba673575de31650bcb39d7cfe0224bf1b7b449 (patch) | |
| tree | 77ab559fd57445dc54d568b361dc54ef7b6ee3a8 /0001-efi-Lock-down-the-kernel-if-booted-in-secure-boot-mo.patch | |
| parent | 74ab72ba21a4bb026b91637fd91ef20edef750a0 (diff) | |
| parent | fa1dee0747e32fcab94c1695e980d192cc8bac51 (diff) | |
| download | kernel-02ba673575de31650bcb39d7cfe0224bf1b7b449.tar.gz kernel-02ba673575de31650bcb39d7cfe0224bf1b7b449.tar.xz kernel-02ba673575de31650bcb39d7cfe0224bf1b7b449.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200602gitf359287765c0.1.vanilla.1.fc33
Diffstat (limited to '0001-efi-Lock-down-the-kernel-if-booted-in-secure-boot-mo.patch')
| -rw-r--r-- | 0001-efi-Lock-down-the-kernel-if-booted-in-secure-boot-mo.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-efi-Lock-down-the-kernel-if-booted-in-secure-boot-mo.patch b/0001-efi-Lock-down-the-kernel-if-booted-in-secure-boot-mo.patch index 97096ad32..3d262ba84 100644 --- a/0001-efi-Lock-down-the-kernel-if-booted-in-secure-boot-mo.patch +++ b/0001-efi-Lock-down-the-kernel-if-booted-in-secure-boot-mo.patch @@ -18,7 +18,7 @@ Signed-off-by: Jeremy Cline <jcline@redhat.com> 2 files changed, 21 insertions(+) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index 08e9f5fc26a8..b6f5510f3d91 100644 +index 28d43754aeb6..19d57bfc12f9 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -18,6 +18,7 @@ @@ -29,7 +29,7 @@ index 08e9f5fc26a8..b6f5510f3d91 100644 #include <linux/usb/xhci-dbgp.h> #include <uapi/linux/mount.h> -@@ -1099,6 +1100,13 @@ void __init setup_arch(char **cmdline_p) +@@ -1105,6 +1106,13 @@ void __init setup_arch(char **cmdline_p) if (efi_enabled(EFI_BOOT)) efi_init(); |