Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Aug 2017 18:20:48 +0000 (11:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Aug 2017 18:20:48 +0000 (11:20 -0700)
commit2bfc37cdef08844c77f801a1beaa1f4efd3215df
tree6801da509ed0cbcd05dc6e2618bb910195b92d28
parent7d7a827ba92c4a1a29fb1d0812db503e80cf3a59
parent9183976ef1c858c289b09066fd57aae51b86653c
Merge branch 'for-linus' of git://git./linux/kernel/git/mszeredi/fuse

Pull fuse fixes from Miklos Szeredi:
 "Fix a few bugs in fuse"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: set mapping error in writepage_locked when it fails
  fuse: Dont call set_page_dirty_lock() for ITER_BVEC pages for async_dio
  fuse: initialize the flock flag in fuse_file on allocation