Merge tag 'efi-urgent-for-v5.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Dec 2021 16:58:35 +0000 (08:58 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Dec 2021 16:58:35 +0000 (08:58 -0800)
commita8ad9a2434dc7967ab285437f443cae633b6fc1c
tree366e95790e66fcc2d916052b1b5150e70239c3c5
parentfc74e0a40e4f9fd0468e34045b0c45bba11dcbb2
parent4bc5e64e6cf37007e436970024e5998ee0935651
Merge tag 'efi-urgent-for-v5.16-2' of git://git./linux/kernel/git/efi/efi

Pull EFI fix from Ard Biesheuvel:
 "Another EFI fix for v5.16:

   - Prevent missing prototype warning from breaking the build under
     CONFIG_WERROR=y"

* tag 'efi-urgent-for-v5.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
  efi: Move efifb_setup_from_dmi() prototype from arch headers