git.itanic.dy.fi Git - linux-stable/commitdiff

author	Linus Torvalds <torvalds@linux-foundation.org>
	Fri, 5 Jul 2019 02:32:11 +0000 (11:32 +0900)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Fri, 5 Jul 2019 02:32:11 +0000 (11:32 +0900)

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

		1	2
fs/dax.c	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge