Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Sep 2017 15:57:50 +0000 (05:57 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Sep 2017 15:57:50 +0000 (05:57 -1000)
Pull misc fixes from Al Viro:
 "A couple of regression fixes, one for this merge window, one for the
  previous cycle"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  ipc/shm: Fix order of parameters when calling copy_compat_shmid_to_user
  iov_iter: fix page_copy_sane for compound pages


Trivial merge