From: Linus Torvalds Date: Sun, 19 Mar 2017 22:45:02 +0000 (-0700) Subject: Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdim... X-Git-Tag: MMI-PSA29.97-13-9~5956 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1b8df61908bde12946877b4c079bb73fc0bd3409;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branch 'libnvdimm-fixes' of git://git./linux/kernel/git/nvdimm/nvdimm Pull device-dax fixes from Dan Williams: "The device-dax driver was not being careful to handle falling back to smaller fault-granularity sizes. The driver already fails fault attempts that are smaller than the device's alignment, but it also needs to handle the cases where a larger page mapping could be established. For simplicity of the immediate fix the implementation just signals VM_FAULT_FALLBACK until fault-size == device-alignment. One fix is for -stable to address pmd-to-pte fallback from the original implementation, another fix is for the new (introduced in 4.11-rc1) pud-to-pmd regression, and a typo fix comes along for the ride. These have received a build success notification from the kbuild robot" * 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: device-dax: fix debug output typo device-dax: fix pud fault fallback handling device-dax: fix pmd/pte fault fallback handling --- 1b8df61908bde12946877b4c079bb73fc0bd3409