From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 9 Apr 2026 18:21:21 +0000 (-0700)
Subject: Merge tag 'efi-fixes-for-v7.0-4' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b42ed3bb884e6b399b46d19df3f5cf015a79c804;p=thirdparty%2Flinux.git

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

b42ed3bb884e6b399b46d19df3f5cf015a79c804