linux-next: manual merge of the kvm-ppc tree with the tree
sfr at canb.auug.org.au
Fri Nov 1 17:05:45 EST 2013
Today's linux-next merge of the kvm-ppc tree got a conflict in
arch/powerpc/include/asm/processor.h between commit 51ae8d4a2b9e
("powerpc: move debug registers in a structure") from the powerpc tree
and commit 95791988fec6 ("powerpc: move debug registers in a structure")
from the kvm-ppc tree.
Different version of the same patch. I used the powerpc tree version
(there wer other changes there).
Stephen Rothwell sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 836 bytes
Desc: not available
More information about the Linuxppc-dev