Merge tag 'efi-urgent-for-v5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 Jun 2022 17:20:11 +0000 (12:20 -0500)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 Jun 2022 17:20:11 +0000 (12:20 -0500)
commitca1fdab7fd27eb069df1384b2850dcd0c2bebe8d
treeb43a92bd59ea3a0f6106031a95758e123bed5770
parent0273fd423b2fe10af96ff713273137c63a7736c0
parentaa6d1ed107eba26f49933216cffe797253914132
Merge tag 'efi-urgent-for-v5.19-1' of git://git./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