]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12c15a7 94a04bc)
Merge branch 'topic/ppc-kvm' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Tue, 29 Aug 2017 11:26:30 +0000 (21:26 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Tue, 29 Aug 2017 11:26:30 +0000 (21:26 +1000)
Merge Nicks commit to rework the KVM thread management, shared with the
KVM tree via the ppc-kvm topic branch.

1  2 
arch/powerpc/kernel/idle_book3s.S patch | diff1 | diff2 | blob | history
arch/powerpc/kvm/book3s_hv_rmhandlers.S patch | diff1 | diff2 | blob | history

diff --cc arch/powerpc/kernel/idle_book3s.S
Simple merge
local clone of linux.git