Merge branch 'for-4.18/mcsafe' into libnvdimm-for-next

diff --cc drivers/dax/super.c
Simple merge

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

diff --cc fs/dax.c
Simple merge

diff --cc include/linux/dax.h
Simple merge

diff --cc lib/iov_iter.c
Simple merge