Merge tag 'x86_core_for_v6.1_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 4 Oct 2022 16:46:22 +0000 (09:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 4 Oct 2022 16:46:22 +0000 (09:46 -0700)
commit8cded8fb1299eb20fc2f7a89dc9328cdf1baf9e5
treefe049b0941ac6ba9b3b8084c5eaf1a472244a7ef
parent5bb3a16dbea8ac40a36056e8ca79d37d47198a67
parent8c03af3e090e9d57d90f482d344563dd4bae1e66
Merge tag 'x86_core_for_v6.1_rc1' of git://git./linux/kernel/git/tip/tip

Pull x86 core fixes from Borislav Petkov:

 - Make sure an INT3 is slapped after every unconditional retpoline JMP
   as both vendors suggest

 - Clean up pciserial a bit

* tag 'x86_core_for_v6.1_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86,retpoline: Be sure to emit INT3 after JMP *%\reg
  x86/earlyprintk: Clean up pciserial
arch/x86/kernel/alternative.c
include/linux/pci_ids.h