Messages in this thread |  | | Date | Fri, 1 Nov 2013 17:05:45 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the kvm-ppc tree with the tree |
| |
Hi Alexander,
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).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] |  |