Merge tag 'locking-urgent-2021-11-14' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Nov 2021 18:30:17 +0000 (10:30 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Nov 2021 18:30:17 +0000 (10:30 -0800)
Pull x86 static call update from Thomas Gleixner:
 "A single fix for static calls to make the trampoline patching more
  robust by placing explicit signature bytes after the call trampoline
  to prevent patching random other jumps like the CFI jump table
  entries"

* tag 'locking-urgent-2021-11-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  static_call,x86: Robustify trampoline patching


Trivial merge