Skip to content
  • Linus Torvalds's avatar
    Merge branch 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 162b246e
    Linus Torvalds authored
    Pull EFI updates from Ingo Molnar:
     "The main changes in this cycle were:
    
       - Rework the EFI capsule loader to allow for workarounds for
         non-compliant firmware (Ard Biesheuvel)
    
       - Implement a capsule loader quirk for Quark X102x (Jan Kiszka)
    
       - Enable SMBIOS/DMI support for the ARM architecture (Ard Biesheuvel)
    
       - Add CONFIG_EFI_PGT_DUMP=y support for x86-32 and kexec (Sai
         Praneeth)
    
       - Fixes for EFI support for Xen dom0 guests running under x86-64
         hosts (Daniel Kiper)"
    
    * 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      x86/xen/efi: Initialize only the EFI struct members used by Xen
      efi: Process the MEMATTR table only if EFI_MEMMAP is enabled
      efi/arm: Enable DMI/SMBIOS
      x86/efi: Extend CONFIG_EFI_PGT_DUMP support to x86_32 and kexec as well
      efi/efi_test: Use memdup_user() helper
      efi/capsule: Add support for Quark security header
      efi/capsule-loader: Use page addresses rather than struct page pointers
      efi/capsule-loader: Redirect calls to efi_capsule_setup_info() via weak alias
      efi/capsule: Remove NULL test on kmap()
      efi/capsule-loader: Use a cached copy of the capsule header
      efi/capsule: Adjust return type of efi_capsule_setup_info()
      efi/capsule: Clean up pr_err/_info() messages
      efi/capsule: Remove pr_debug() on ENOMEM or EFAULT
      efi/capsule: Fix return code on failing kmap/vmap
    162b246e