projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 806c0e6 0c8fb65)
Merge branch 'topic/ppc-kvm' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Thu, 26 Aug 2021 11:21:11 +0000 (21:21 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 26 Aug 2021 11:21:11 +0000 (21:21 +1000)
Merge some KVM patches we are keeping in a topic branch in case there
are any merge conflicts that need resolving.

1  2 
arch/powerpc/kvm/book3s_hv.c patch | diff1 | diff2 | blob | history
arch/powerpc/platforms/powernv/idle.c patch | diff1 | diff2 | blob | history

diff --cc arch/powerpc/kvm/book3s_hv.c
Simple merge
diff --cc arch/powerpc/platforms/powernv/idle.c
Simple merge
ep93xx device tree rework repo: git://git.maquefel.me/linux.git