From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 15 Dec 2020 11:14:38 +0000 (+0100)
Subject: Merge tag 'efi-next-for-v5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: iomap-folio-5.17-old~2370^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3dcb8b53cbd2cc5618863b19ef00f8ea82f27e83;p=users%2Fwilly%2Flinux.git

Merge tag 'efi-next-for-v5.11-3' of git://git.kernel.org/pub/scm/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
---

3dcb8b53cbd2cc5618863b19ef00f8ea82f27e83