Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Jan 2016 20:54:03 +0000 (12:54 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Jan 2016 20:54:03 +0000 (12:54 -0800)
commit19ccb28e296d5afa299db1003d37e5d37994d46e
tree124859635b8f0c6c429c0b19ca3a092ad42da703
parentafd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc
parenta7f61e89af73e9bf760826b20dba4e637221fcb9
Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs

Pull vfs compat_ioctl fixes from Al Viro:
 "This is basically Jann's patches from last week.  I have _not_
  included the stuff like switching i2c to ->compat_ioctl() into this
  one - those need more testing.

  Ideally I would like fs/compat_ioctl.c shrunk a lot, but that's a
  separate story"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  compat_ioctl: don't call do_ioctl under set_fs(KERNEL_DS)
  compat_ioctl: don't pass fd around when not needed
  compat_ioctl: don't look up the fd twice