Merge tag 'for-4.15-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 25 Jan 2018 17:03:10 +0000 (09:03 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 25 Jan 2018 17:03:10 +0000 (09:03 -0800)
commit525273fb2e7c84c98e3dffc5b446141bda99ff01
tree7221dcf4a4409dcf42e42eaecff52d927ca591f6
parent5b7d27967dabfb17c21b0d98b29153b9e3ee71e5
parente4fd493c0541d36953f7b9d3bfced67a1321792f
Merge tag 'for-4.15-tag' of git://git./linux/kernel/git/kdave/linux

Pull btrfs fix from David Sterba:
 "It's been reported recently that readdir can list stale entries under
  some conditions. Fix it."

* tag 'for-4.15-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  Btrfs: fix stale entries in readdir