Merge branch 'fixes' into next

Merge our fixes branch to bring in some changes that are prerequisites
for work in next.

diff --combined arch/powerpc/Kconfig
index 4fd4924,2ca5418..abaf1ef
--- 1/arch/powerpc/Kconfig
--- 2/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -147,6 -147,7 +147,7 @@@ config PP
        select ARCH_MIGHT_HAVE_PC_SERIO
        select ARCH_OPTIONAL_KERNEL_RWX         if ARCH_HAS_STRICT_KERNEL_RWX
        select ARCH_OPTIONAL_KERNEL_RWX_DEFAULT
+       select ARCH_SPLIT_ARG64                 if PPC32
        select ARCH_STACKWALK
        select ARCH_SUPPORTS_ATOMIC_RMW
        select ARCH_SUPPORTS_DEBUG_PAGEALLOC    if PPC_BOOK3S || PPC_8xx || 40x
@@@ -285,7 -286,7 +286,7 @@@
        #
  
  config PPC_LONG_DOUBLE_128
-       depends on PPC64
+       depends on PPC64 && ALTIVEC
        def_bool $(success,test "$(shell,echo __LONG_DOUBLE_128__ | $(CC) -E -P -)" = 1)
  
  config PPC_BARRIER_NOSPEC
@@@ -293,9 -294,6 +294,9 @@@
        default y
        depends on PPC_BOOK3S_64 || PPC_E500
  
 +config PPC_HAS_LBARX_LHARX
 +      bool
 +
  config EARLY_PRINTK
        bool
        default y