tree 671ffa07e78f110cdeaab853127fc2b1359444ee
parent a5e90b1b075f89f084047628d4ef181aded0bbfb
parent 0354aec19ce3d355c6213b0434064efc25c9b22c
author Linus Torvalds <torvalds@linux-foundation.org> 1450380013 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1450380013 -0800

Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm

Pull libnvdimm fixes from Dan Williams:

 - Two bug fixes for misuse of PAGE_MASK in scatterlist and dma-debug.
   These are tagged for -stable.  The scatterlist impact is potentially
  corrupted dma addresses on HIGHMEM enabled platforms.

 - A minor locking fix for the NFIT hot-add implementation that is new
   in 4.4-rc.  This would only trigger in the case a hot-add raced
   driver removal.

* 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  dma-debug: Fix dma_debug_entry offset calculation
  Revert "scatterlist: use sg_phys()"
  nfit: acpi_nfit_notify(): Do not leave device locked