Merge tag 'for-linus-5.17' of git://git.kernel.org/pub/scm/virt/kvm/kvm
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 20 Mar 2022 16:46:52 +0000 (09:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 20 Mar 2022 16:46:52 +0000 (09:46 -0700)
Pull kvm fix from Paolo Bonzini:
 "Fix for the SLS mitigation, which makes a 'SETcc/RET' pair grow
  to 'SETcc/RET/INT3'.

  This doesn't fit in 4 bytes any more, so the alignment has to
  change to 8 for this case"

* tag 'for-linus-5.17' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  kvm/emulate: Fix SETcc emulation function offsets with SLS


Trivial merge