From: Linus Torvalds Date: Sun, 1 Nov 2015 22:13:54 +0000 (-0800) Subject: Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdim... X-Git-Tag: firefly_0821_release~176^2~855 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=95fc00a4e15e804356d01c1c53c7da3d99a94f20;p=firefly-linux-kernel-4.4.55.git Merge branch 'libnvdimm-fixes' of git://git./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 --- 95fc00a4e15e804356d01c1c53c7da3d99a94f20