From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 21 Jun 2022 17:20:11 +0000 (-0500)
Subject: Merge tag 'efi-urgent-for-v5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ca1fdab7fd27eb069df1384b2850dcd0c2bebe8d;p=people%2Faperard%2Flinux.git

Merge tag 'efi-urgent-for-v5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi

Pull EFI fixes from Ard Biesheuvel:

 - remove pointless include of asm/efi.h, which does not exist on ia64

 - fix DXE service marshalling prototype for mixed mode

* tag 'efi-urgent-for-v5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
  efi/x86: libstub: Fix typo in __efi64_argmap* name
  efi: sysfb_efi: remove unnecessary <asm/efi.h> include
---

ca1fdab7fd27eb069df1384b2850dcd0c2bebe8d