From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 25 Jan 2018 17:03:10 +0000 (-0800)
Subject: Merge tag 'for-4.15-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
X-Git-Tag: v4.15~13
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=525273fb2e7c84c98e3dffc5b446141bda99ff01;p=linux-platform-drivers-x86.git

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

525273fb2e7c84c98e3dffc5b446141bda99ff01