Commit b42ed3bb884e for kernel

commit b42ed3bb884e6b399b46d19df3f5cf015a79c804
Merge: bb2ea74eeb67 5241c2ca33bb
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu Apr 9 11:21:21 2026 -0700

    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