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)
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


Trivial merge