[GIT PULL] EFI fix for v7.0 #4

[GIT PULL] EFI fix for v7.0 #4

[Ard Biesheuvel]

From: Ard Biesheuvel <ardb@kernel.org>

Hi Linus,

Please pull this final v7.0 fix for a misplaced closing parenthesis in a
preprocessor conditional.


The following changes since commit 217c0a5c177a3d4f7c8497950cbf5c36756e8bbb:

  x86/efi: efi_unmap_boot_services: fix calculation of ranges_to_free size (2026-03-20 15:31:10 +0100)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git tags/efi-fixes-for-v7.0-4

for you to fetch changes up to 5241c2ca33bb181bf7abb7cb4bba1cc67d1b6278:

  firmware: efi: Never declare sysfb_primary_display on x86 (2026-04-08 16:09:11 +0200)

----------------------------------------------------------------
EFI fix for v7.0 #4

Fix an incorrect preprocessor conditional that may result in duplicate
instances of sysfb_primary_display on x86.

----------------------------------------------------------------
Thomas Zimmermann (1):
      firmware: efi: Never declare sysfb_primary_display on x86

 drivers/firmware/efi/efi-init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Re: [GIT PULL] EFI fix for v7.0 #4

[pr-tracker-bot]

The pull request you sent on Thu,  9 Apr 2026 17:25:24 +0200:

> git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git tags/efi-fixes-for-v7.0-4

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/b42ed3bb884e6b399b46d19df3f5cf015a79c804

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html