Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4

Conflicts:
	keep check_object_size in copy_from_user
	in arch/sparc/include/asm/uaccess_64.h

diff --cc arch/sparc/include/asm/uaccess_64.h
index 9c2b93bcb631b4262e7974286483a0c2b0ae3b06,f428512481f9e52a52a6889180500a4ef6e33c87..a6847fc05a6dc7fbb33d6ebcddb7bd7e116b37cc
--- 1/arch/sparc/include/asm/uaccess_64.h
--- 2/arch/sparc/include/asm/uaccess_64.h
+++ b/arch/sparc/include/asm/uaccess_64.h
@@@ -248,17 -207,7 +207,9 @@@ unsigned long __must_check ___copy_from
  static inline unsigned long __must_check
  copy_from_user(void *to, const void __user *from, unsigned long size)
  {
-       unsigned long ret;
- 
 +      check_object_size(to, size, false);
 +
-       ret = ___copy_from_user(to, from, size);
-       if (unlikely(ret))
-               ret = copy_from_user_fixup(to, from, size);
- 
-       return ret;
+       return ___copy_from_user(to, from, size);
  }
  #define __copy_from_user copy_from_user
  
@@@ -268,16 -217,7 +219,9 @@@ unsigned long __must_check ___copy_to_u
  static inline unsigned long __must_check
  copy_to_user(void __user *to, const void *from, unsigned long size)
  {
-       unsigned long ret;
- 
 +      check_object_size(from, size, true);
 +
-       ret = ___copy_to_user(to, from, size);
-       if (unlikely(ret))
-               ret = copy_to_user_fixup(to, from, size);
-       return ret;
+       return ___copy_to_user(to, from, size);
  }
  #define __copy_to_user copy_to_user