projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0ea3286 2d2ccf2)
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)
To resolve conflicts with the PV TLB flush series.

1  2 
arch/x86/include/asm/hyperv-tlfs.h patch | diff1 | diff2 | blob | history
arch/x86/kvm/x86.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/include/asm/hyperv-tlfs.h
Simple merge
diff --cc arch/x86/kvm/x86.c
Simple merge
John Crispins staging tree