]> www.infradead.org Git - linux.git/commitdiff
projects / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8ee74a9 5b47d59)
Merge branch 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 May 2017 16:01:21 +0000 (09:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 May 2017 16:01:21 +0000 (09:01 -0700)
Pull vfs fix from Al Viro:
 "Braino fix for iov_iter_revert() misuse"

* 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fix braino in generic_file_read_iter()

1  2 
lib/iov_iter.c patch | diff1 | diff2 | blob | history
mm/filemap.c patch | diff1 | diff2 | blob | history

diff --cc lib/iov_iter.c
Simple merge
diff --cc mm/filemap.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.