From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 12 Dec 2022 19:10:02 +0000 (-0800)
Subject: Merge tag 'x86-urgent-2022-12-12' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.2-rc1~197
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9c2b840a3b446ec2a7fc1cfb68af481905ec6f5f;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'x86-urgent-2022-12-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Thomas Gleixner:
 "Three small x86 fixes which did not make it into 6.1:

   - Remove a superfluous noinline which prevents GCC-7.3 to optimize a
     stub function away

   - Allow uprobes on REP NOP and do not treat them like word-sized
     branch instructions

   - Make the VDSO symbol export of __vdso_sgx_enter_enclave() depend on
     CONFIG_X86_SGX to prevent build failures with newer LLVM versions
     which rightfully detect that there is no function behind the
     symbol"

* tag 'x86-urgent-2022-12-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/vdso: Conditionally export __vdso_sgx_enter_enclave()
  uprobes/x86: Allow to probe a NOP instruction with 0x66 prefix
  x86/alternative: Remove noinline from __ibt_endbr_seal[_end]() stubs
---

9c2b840a3b446ec2a7fc1cfb68af481905ec6f5f