From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 26 Oct 2019 10:26:04 +0000 (-0400)
Subject: Merge tag 'dax-fix-5.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm... 
X-Git-Tag: v5.4-rc5~18
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=485fc4b69cd28f295947535175c147b943b0b2e4;p=sfrench%2Fcifs-2.6.git

Merge tag 'dax-fix-5.4-rc5' of git://git./linux/kernel/git/nvdimm/nvdimm

Pull dax fix from Dan Williams:
 "Fix a performance regression that followed from a fix to the
  conversion of the fsdax implementation to the xarray. v5.3 users
  report that they stop seeing huge page mappings on an application +
  filesystem layout that was seeing huge pages previously on v5.2"

* tag 'dax-fix-5.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  fs/dax: Fix pmd vs pte conflict detection
---

485fc4b69cd28f295947535175c147b943b0b2e4