tree ac0566ccbabc5ed854647a5ffd5dd5f018f66565
parent 236bfd8ed868edfc42a656682487683ade3fede4
parent 5c672ab3f0ee0f78f7acad183f34db0f8781a200
author Linus Torvalds <torvalds@linux-foundation.org> 1467572520 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1467572520 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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