Merge tag 'dax-fix-5.2-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Jul 2019 02:32:11 +0000 (11:32 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Jul 2019 02:32:11 +0000 (11:32 +0900)
commitcde357c392e93aa7fcfc019403e0d1792081d634
tree7d137cd4868622599fca7b4f80cb243432eef58d
parent2cd7cdc7e420a343743db781484e801fd784a1f1
parent1571c029a2ff289683ddb0a32253850363bcb8a7
Merge tag 'dax-fix-5.2-rc8' of git://git./linux/kernel/git/nvdimm/nvdimm

Pull dax fix from Dan Williams:
 "A single dax fix that has been soaking awaiting other fixes under
  discussion to join it. As it is getting late in the cycle lets proceed
  with this fix and save follow-on changes for post-v5.3-rc1.

   - Fix xarray entry association for mixed mappings"

* tag 'dax-fix-5.2-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  dax: Fix xarray entry association for mixed mappings
fs/dax.c