From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 13 Mar 2022 17:36:38 +0000 (-0700)
Subject: Merge tag 'x86_urgent_for_v5.17_rc8' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.17-rc8~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f0e18b03fcafd8344539101f564ae358950ae892;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'x86_urgent_for_v5.17_rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Borislav Petkov:

 - Free shmem backing storage for SGX enclave pages when those are
   swapped back into EPC memory

 - Prevent do_int3() from being kprobed, to avoid recursion

 - Remap setup_data and setup_indirect structures properly when
   accessing their members

 - Correct the alternatives patching order for modules too

* tag 'x86_urgent_for_v5.17_rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/sgx: Free backing memory after faulting the enclave page
  x86/traps: Mark do_int3() NOKPROBE_SYMBOL
  x86/boot: Add setup_indirect support in early_memremap_is_setup_data()
  x86/boot: Fix memremap of setup_indirect structures
  x86/module: Fix the paravirt vs alternative order
---

f0e18b03fcafd8344539101f564ae358950ae892