Merge remote-tracking branch 'powerpc/next'

Conflicts:
	arch/powerpc/include/asm/sections.h
	arch/powerpc/include/asm/topology.h

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge

diff --cc arch/powerpc/include/asm/kvm_ppc.h
Simple merge

diff --cc arch/powerpc/include/asm/reg.h
Simple merge

diff --cc arch/powerpc/include/asm/sections.h
index 52179033067262f8f107be29c16b1fba6b8d4cee,d1bb96d5a298b3f82a068ba0dd9ec9b41095a695..a5e930aca804341a21cd90a0c8f2b4367de18e3f
--- 1/arch/powerpc/include/asm/sections.h
--- 2/arch/powerpc/include/asm/sections.h
+++ b/arch/powerpc/include/asm/sections.h
@@@ -39,17 -39,7 +39,18 @@@ static inline int overlaps_kernel_text(
                (unsigned long)_stext < end;
  }
  
 +static inline int overlaps_kvm_tmp(unsigned long start, unsigned long end)
 +{
 +#ifdef CONFIG_KVM_GUEST
 +      extern char kvm_tmp[];
 +      return start < (unsigned long)kvm_tmp &&
 +              (unsigned long)&kvm_tmp[1024 * 1024] < end;
 +#else
 +      return 0;
 +#endif
 +}
 +
+ #if !defined(_CALL_ELF) || _CALL_ELF != 2
  #undef dereference_function_descriptor
  static inline void *dereference_function_descriptor(void *ptr)
  {

diff --cc arch/powerpc/include/asm/systbl.h
Simple merge

diff --cc arch/powerpc/include/asm/topology.h
Simple merge

diff --cc arch/powerpc/kernel/asm-offsets.c
Simple merge

diff --cc arch/powerpc/kernel/epapr_paravirt.c
Simple merge

diff --cc arch/powerpc/kernel/fadump.c
Simple merge

diff --cc arch/powerpc/kernel/pci-common.c
Simple merge

diff --cc arch/powerpc/kernel/pci_of_scan.c
Simple merge

diff --cc arch/powerpc/kernel/smp.c
Simple merge

diff --cc arch/powerpc/kvm/book3s_hv.c
Simple merge

diff --cc arch/powerpc/kvm/book3s_hv_rmhandlers.S
Simple merge

diff --cc arch/powerpc/kvm/powerpc.c
Simple merge

diff --cc arch/powerpc/mm/hash_utils_64.c
Simple merge

diff --cc arch/powerpc/mm/slb.c
Simple merge

diff --cc arch/powerpc/platforms/powernv/opal.c
Simple merge

diff --cc arch/powerpc/platforms/pseries/setup.c
Simple merge

diff --cc drivers/pci/pci.c
Simple merge