]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge tag 'efi-fixes-for-v7.0-4' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 Apr 2026 18:21:21 +0000 (11:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 Apr 2026 18:21:21 +0000 (11:21 -0700)
Pull EFI fix from Ard Biesheuvel:
 "Fix an incorrect preprocessor conditional that may result in duplicate
  instances of sysfb_primary_display on x86"

* tag 'efi-fixes-for-v7.0-4' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
  firmware: efi: Never declare sysfb_primary_display on x86


Trivial merge