]> asedeno.scripts.mit.edu Git - linux.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)
commitf33ecec9bb5199c5a4dd296af604f70273d2636e
treeba12665fe8f7952a64013bef9125bfac27ff1fda
parent0ea3286e2df74c9ec2fadbf91170cd3edd14e3e5
parent2d2ccf24939cf369f7473c7e4ea309891be91848
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