Merge remote-tracking branch 'uapi/for-next'

diff --cc arch/arm/include/asm/swab.h
index 32ee164a2f6bb73e066dd34debd6b1355f118f2a,e82adf64d1dd727e18dd0d54781323c98a9e5c20..b859d82e30cafb5489fdb0297319a570f8362df3
--- 1/arch/arm/include/asm/swab.h
--- 2/arch/arm/include/asm/swab.h
+++ b/arch/arm/include/asm/swab.h
@@@ -22,9 -22,10 +22,10 @@@
  #  define __SWAB_64_THRU_32__
  #endif
  
- #if defined(__KERNEL__) && __LINUX_ARM_ARCH__ >= 6
+ #if defined(__KERNEL__)
+ #if __LINUX_ARM_ARCH__ >= 6
  
 -static inline __attribute_const__ __u16 __arch_swab16(__u16 x)
 +static inline __attribute_const__ __u32 __arch_swahb32(__u32 x)
  {
        __asm__ ("rev16 %0, %1" : "=r" (x) : "r" (x));
        return x;