linux-next: manual merge of the kvm-ppc-paulus tree with the powerpc tree

2016-11-23 Thread Stephen Rothwell
Hi Paul, Today's linux-next merge of the kvm-ppc-paulus tree got a conflict in: arch/powerpc/mm/pgtable-radix.c between commit: 555c16328ae6 ("powerpc/mm: Correct process and partition table max size") from the powerpc tree and commit: 9d66195807ac ("powerpc/64: Provide functions for ac

linux-next: manual merge of the kvm-ppc-paulus tree with the powerpc tree

2016-11-23 Thread Stephen Rothwell
Hi Paul, Today's linux-next merge of the kvm-ppc-paulus tree got a conflict in: arch/powerpc/include/asm/reg.h between commit: 29a969b76481 ("powerpc: Revert Load Monitor Register Support") from the powerpc tree and commits: 7fd317f8c330 ("powerpc/64: Add some more SPRs and SPR bits for

linux-next: manual merge of the kvm-ppc-paulus tree with the powerpc tree

2016-06-26 Thread Stephen Rothwell
Hi Paul, Today's linux-next merge of the kvm-ppc-paulus tree got a conflict in: arch/powerpc/kernel/traps.c between commit: 42f5b4cacd78 ("powerpc: Introduce asm-prototypes.h") from the powerpc tree and commit: fd7bacbca47a ("KVM: PPC: Book3S HV: Fix TB corruption in guest exit path on