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

Hi Dan, Today's linux-next merge of the nvdimm tree got a conflict in: fs/dax.c between commit: ee472d835c26 ("block: add a flags argument to (__)blkdev_issue_zeroout") from the block tree and commit: 52d52d6f1178 ("filesystem-dax: convert to dax_direct_access()") from the nvdimm tree.

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

Hi Dan, Today's linux-next merge of the nvdimm tree got a conflict in: drivers/block/brd.c between commit: f09a06a193d9 ("brd: remove discard support") from the block tree and commit: 1647b9b959c7 ("brd: add dax_operations support") from the nvdimm tree. Dan, thanks for the example me

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

Hi Dan, Today's linux-next merge of the nvdimm tree got a conflict in: drivers/nvdimm/pmem.c between commit: 0d52c756a665 ("block: convert to device_add_disk()") from the block tree and commit: f02716db951c ("libnvdimm: use devm_add_action_or_reset()") from the nvdimm tree. I fixed it