From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 20 Mar 2022 16:46:52 +0000 (-0700)
Subject: Merge tag 'for-linus-5.17' of git://git.kernel.org/pub/scm/virt/kvm/kvm
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7445b2dcd77ae8385bd08bb6c2db20ea0cfa6230;p=linux.git

Merge tag 'for-linus-5.17' of git://git./virt/kvm/kvm

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
---

7445b2dcd77ae8385bd08bb6c2db20ea0cfa6230