Merge branch 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 May 2016 22:59:09 +0000 (15:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 May 2016 22:59:09 +0000 (15:59 -0700)
Pull vfs iov_iter regression fix from Al Viro:
 "Fix for braino in 'fold checks into iterate_and_advance()'"

* 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  do "fold checks into iterate_and_advance()" right

1  2 
lib/iov_iter.c

diff --cc lib/iov_iter.c
Simple merge