linux-next: manual merge of the dax-misc tree with Linus' tree

Hi all, Today's linux-next merge of the dax-misc tree got a conflict in: include/linux/dax.h between commit: c8b8e32d700f ("direct-io: eliminate the offset argument to ->direct_IO") from Linus' tree and commit: e804315dd0f5 ("dax: Define DAX lock bit for radix tree exceptional entry")

linux-next: manual merge of the dax-misc tree with Linus' tree

Hi all, Today's linux-next merge of the dax-misc tree got a conflict in: include/linux/dax.h between commit: c8b8e32d700f ("direct-io: eliminate the offset argument to ->direct_IO") from Linus' tree and commit: e804315dd0f5 ("dax: Define DAX lock bit for radix tree exceptional entry")