]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge tag 'efi-urgent-for-v6.7-3' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Jan 2024 19:50:17 +0000 (11:50 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Jan 2024 19:50:17 +0000 (11:50 -0800)
Pull EFI fix from Ard Biesheuvel:

 - Ensure that the KASLR load flag is set in boot_params when loading
   the kernel randomized directly from the EFI stub

* tag 'efi-urgent-for-v6.7-3' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
  efi/x86: Fix the missing KASLR_FLAG bit in boot_params->hdr.loadflags


Trivial merge