Merge tag 'efi-next-for-v5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorThomas Gleixner <tglx@linutronix.de>
Tue, 15 Dec 2020 11:14:38 +0000 (12:14 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 15 Dec 2020 11:14:38 +0000 (12:14 +0100)
commit3dcb8b53cbd2cc5618863b19ef00f8ea82f27e83
tree83017fb4ceb0c01a83a4ac42cd38494b3f8e8807
parent54649911f31b6e7c2a79a1426ca98259139e4c35
parentd72c8b0e1cacc39495cd413433d260e8ae59374a
Merge tag 'efi-next-for-v5.11-3' of git://git./linux/kernel/git/efi/efi into efi/core

Pull followup fixes for EFI from Ard Biesheuvel:

 - fix the build breakage on IA64 caused by recent capsule loader changes

 - suppress a type mismatch build warning in the expansion of
   EFI_PHYS_ALIGN on ARM

Link: https://lore.kernel.org/r/20201215080144.17077-1-ardb@kernel.org