diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-12-26 10:28:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-12-26 10:28:55 -0800 |
| commit | e8ffcd3ab0e5d7332cc75c214fe74e52240b117b (patch) | |
| tree | ccf354734caebaa425909462d842368b363e610d /Makefile | |
| parent | 2afa90bd1c7526766b5eadb1856988b61a31501f (diff) | |
| parent | 57690554abe135fee81d6ac33cc94d75a7e224bb (diff) | |
Merge tag 'x86_urgent_for_v5.16_rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Borislav Petkov:
- Prevent potential undefined behavior due to shifting pkey constants
into the sign bit
- Move the EFI memory reservation code *after* the efi= cmdline parsing
has happened
- Revert two commits which turned out to be the wrong direction to
chase when accommodating early memblock reservations consolidation
and command line parameters parsing
* tag 'x86_urgent_for_v5.16_rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/pkey: Fix undefined behaviour with PKRU_WD_BIT
x86/boot: Move EFI range reservation after cmdline parsing
Revert "x86/boot: Pull up cmdline preparation and early param parsing"
Revert "x86/boot: Mark prepare_command_line() __init"
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions