From: Linus Torvalds Date: Sun, 21 Nov 2021 19:25:19 +0000 (-0800) Subject: Merge tag 'x86-urgent-2021-11-21' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v6.6-pxa1908~5115 X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=40c93d7fff6ff05c1c4c9f9c01a067eac6a791b1;p=linux.git Merge tag 'x86-urgent-2021-11-21' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull x86 fixes from Thomas Gleixner: - Move the command line preparation and the early command line parsing earlier so that the command line parameters which affect early_reserve_memory(), e.g. efi=nosftreserve, are taken into account. This was broken when the invocation of early_reserve_memory() was moved recently. - Use an atomic type for the SGX page accounting, which is read and written locklessly, to plug various race conditions related to it. * tag 'x86-urgent-2021-11-21' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/sgx: Fix free page accounting x86/boot: Pull up cmdline preparation and early param parsing --- 40c93d7fff6ff05c1c4c9f9c01a067eac6a791b1