Merge fixup for secureboot

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>

kernel.spec

@@ -741,6 +741,7 @@ Source4000: README.rst
 %if !%{nopatches}
 
 Patch1: patch-%{rpmversion}-redhat.patch
+Patch2: secureboot_merge_fix.patch
 %endif
 
 # empty final patch to facilitate testing of kernel patches
@@ -1244,6 +1245,7 @@ cp -a %{SOURCE1} .
 %if !%{nopatches}
 
 ApplyOptionalPatch patch-%{rpmversion}-redhat.patch
+ApplyOptionalPatch secureboot_merge_fix.patch
 %endif
 
 ApplyOptionalPatch linux-kernel-test.patch

secureboot_merge_fix.patch

@@ -0,0 +1,18 @@
+diff --git a/include/linux/efi.h b/include/linux/efi.h
+index 03cb4259200d..4c55e3aa7e95 100644
+--- a/include/linux/efi.h
++++ b/include/linux/efi.h
+@@ -1096,13 +1096,6 @@ static inline bool efi_runtime_disabled(void) { return true; }
+ extern void efi_call_virt_check_flags(unsigned long flags, const char *call);
+ extern unsigned long efi_call_virt_save_flags(void);
+
+-enum efi_secureboot_mode {
+-	efi_secureboot_mode_unset,
+-	efi_secureboot_mode_unknown,
+-	efi_secureboot_mode_disabled,
+-	efi_secureboot_mode_enabled,
+-};
+-
+ static inline
+ enum efi_secureboot_mode efi_get_secureboot_mode(efi_get_variable_t *get_var)
+ {