]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag 'dax-fix-5.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Oct 2019 10:26:04 +0000 (06:26 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Oct 2019 10:26:04 +0000 (06:26 -0400)
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


Trivial merge