asedeno.scripts.mit.edu Git - linux.git/commit

]> asedeno.scripts.mit.edu Git - linux.git/commit

author	Paul Mackerras <paulus@ozlabs.org>
	Thu, 9 Nov 2017 03:30:24 +0000 (14:30 +1100)
committer	Paul Mackerras <paulus@ozlabs.org>
	Thu, 9 Nov 2017 03:30:24 +0000 (14:30 +1100)
commit	072df8130c6b602c8ee219f7b06394680cafad2f
tree	ad7cbc2342be72236851b19a5d9e8a0908dbbdf7	tree \| snapshot
parent	c01015091a77035de1939ef106bfbcaf9a21395f	commit \| diff
parent	38c53af853069adf87181684370d7b8866d6387b	commit \| diff

Merge branch 'kvm-ppc-fixes' into kvm-ppc-next

This merges in a couple of fixes from the kvm-ppc-fixes branch that
modify the same areas of code as some commits from the kvm-ppc-next
branch, in order to resolve the conflicts.

Signed-off-by: Paul Mackerras <paulus@ozlabs.org>

local clone of linux.git

RSS Atom

arch/powerpc/kvm/book3s_64_mmu_hv.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kvm/book3s_hv.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kvm/book3s_hv_rmhandlers.S	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kvm/powerpc.c	diff1 \|	diff2 \|	blob \| history