From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 27 Dec 2021 16:58:35 +0000 (-0800)
Subject: Merge tag 'efi-urgent-for-v5.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.1-rc5~2377
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a8ad9a2434dc7967ab285437f443cae633b6fc1c;p=platform%2Fkernel%2Flinux-starfive.git

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
---

a8ad9a2434dc7967ab285437f443cae633b6fc1c