]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'x86/hyperv' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
authorRadim Krčmář <rkrcmar@redhat.com>
Sat, 26 May 2018 11:45:49 +0000 (13:45 +0200)
committerRadim Krčmář <rkrcmar@redhat.com>
Sat, 26 May 2018 11:45:49 +0000 (13:45 +0200)
commit1a00fb2538795d4db0938bdff4ff8de89f08bba6
treeba12665fe8f7952a64013bef9125bfac27ff1fda
parentf7eeecbb8f34d173ecb5c5ae6d1fedf16b5a9322
parentc79cc41425f45dbd5f50b1713bb7f67eeac1f635
Merge branch 'x86/hyperv' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

To resolve conflicts with the PV TLB flush series.
arch/x86/include/asm/hyperv-tlfs.h
arch/x86/kvm/x86.c