]> www.infradead.org Git - linux.git/commitdiff
projects / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b9b71f4 54ad60b)
Merge branch 'kvm-5.20-msr-eperm'
authorSean Christopherson <seanjc@google.com>
Fri, 8 Jul 2022 22:02:41 +0000 (15:02 -0700)
committerSean Christopherson <seanjc@google.com>
Fri, 8 Jul 2022 22:02:41 +0000 (15:02 -0700)
Merge a bug fix and cleanups for {g,s}et_msr_mce() using a base that
predates commit 281b52780b57 ("KVM: x86: Add emulation for
MSR_IA32_MCx_CTL2 MSRs."), which was written with the intention that it
be applied _after_ the bug fix and cleanups.  The bug fix in particular
needs to be sent to stable trees; give them a stable hash to use.

1  2 
arch/x86/kvm/x86.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/kvm/x86.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.