linux-next: manual merge of the nvdimm tree with the ext4 tree

Hi Dan, Today's linux-next merge of the nvdimm tree got a conflict in: fs/ext4/inode.c between commit: 545052e9e35a ("ext4: Switch to iomap for SEEK_HOLE / SEEK_DATA") from the ext4 tree and commit: 31bc9582e43d ("ext4: Support for synchronous DAX faults") from the nvdimm tree. I

linux-next: manual merge of the nvdimm tree with the ext4 tree

Hi Dan, Today's linux-next merge of the nvdimm tree got a conflict in: fs/ext4/inode.c between commit: 545052e9e35a ("ext4: Switch to iomap for SEEK_HOLE / SEEK_DATA") from the ext4 tree and commit: 31bc9582e43d ("ext4: Support for synchronous DAX faults") from the nvdimm tree. I

linux-next: manual merge of the nvdimm tree with the ext4 tree

Hi Dan, Today's linux-next merge of the nvdimm tree got a conflict in: fs/dax.c between commit: 19fe5f643f89 ("iomap: Switch from blkno to disk offset") from the ext4 tree and commit: cac0def9d075 ("dax: Simplify arguments of dax_insert_mapping()") from the nvdimm tree. I fixed it up

linux-next: manual merge of the nvdimm tree with the ext4 tree

Hi Dan, Today's linux-next merge of the nvdimm tree got a conflict in: fs/dax.c between commit: 19fe5f643f89 ("iomap: Switch from blkno to disk offset") from the ext4 tree and commit: cac0def9d075 ("dax: Simplify arguments of dax_insert_mapping()") from the nvdimm tree. I fixed it up