]> git.ipfire.org Git - thirdparty/linux.git/commit
Merge tag 'efi-fixes-for-v7.0-4' of git://git.kernel.org/pub/scm/linux/kernel/git... master
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)
commitb42ed3bb884e6b399b46d19df3f5cf015a79c804
tree7af7291738d0f84e75867e428aa15c3c8fb1c28a
parentbb2ea74eeb6735eed29bd74695f90f0e5af09f5c
parent5241c2ca33bb181bf7abb7cb4bba1cc67d1b6278
Merge tag 'efi-fixes-for-v7.0-4' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi

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