Merge branch 'work.__copy_in_user' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull __copy_in_user removal from Al Viro:
 "There used to be 6 places in the entire tree calling __copy_in_user(),
  all of them bogus.

  Four got killed off in work.drm branch, this takes care of the
  remaining ones and kills the definition of that sucker"

* 'work.__copy_in_user' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  kill __copy_in_user()
  sanitize do_i2c_smbus_ioctl()

diff --cc fs/compat_ioctl.c
Simple merge

diff --cc include/linux/uaccess.h
Simple merge