Merge branch 'for-4.16/nfit' into libnvdimm-for-next

diff --cc drivers/acpi/nfit/core.c
Simple merge

diff --cc drivers/nvdimm/pmem.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge

diff --cc mm/sparse.c
Simple merge

diff --cc tools/testing/nvdimm/test/nfit.c
Simple merge