Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 3 Jul 2016 19:02:00 +0000 (12:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 3 Jul 2016 19:02:00 +0000 (12:02 -0700)
commit0b295dd5b8eb755bc7b57220d93705994090e954
treeac0566ccbabc5ed854647a5ffd5dd5f018f66565
parent236bfd8ed868edfc42a656682487683ade3fede4
parent5c672ab3f0ee0f78f7acad183f34db0f8781a200
Merge branch 'for-linus' of git://git./linux/kernel/git/mszeredi/fuse

Pull fuse fix from Miklos Szeredi:
 "This makes sure userspace filesystems are not broken by the parallel
  lookups and readdir feature"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: serialize dirops by default