From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 11 Jan 2016 20:54:03 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Tag: Ubuntu-5.0.0-8.9~8089
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=19ccb28e296d5afa299db1003d37e5d37994d46e;p=mirror_ubuntu-disco-kernel.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
---

19ccb28e296d5afa299db1003d37e5d37994d46e