tree ffbfd0bf22ba6c830f1485fe4833cdd47bc80654
parent ca04d396a3229d37d8151311ad70d1255a5807bd
parent 182475b7a2831abf7e6ca83b2aced0bef5dcdfd3
author Linus Torvalds <torvalds@linux-foundation.org> 1446416034 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1446416034 -0800

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

Pull memremap fix from Dan Williams:
 "The new memremap() api introduced in the 4.3 cycle to unify/replace
  ioremap_cache() and ioremap_wt() is mishandling the highmem case.
  This patch has received a build success notification from a
  0day-kbuild-robot run and has received an ack from Ard"

From the commit message:
 "The impact of this bug is low for now since the pmem driver is the
  only user of memremap(), but this is important to fix before more
  conversions to memremap arrive in 4.4"

* 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  memremap: fix highmem support