Merge branch 'iomap-4.9-dax' into for-next

diff --cc fs/iomap.c
Simple merge

diff --cc fs/xfs/xfs_file.c
Simple merge

diff --cc include/linux/iomap.h
index c74226a738a3ef186b752f652010b5918bdfd0cd,14d7067f8b0628cc8c05d73d44637cf3c5a1f881..e63e288dee836c5c81d88909550ee1155eb160b2
--- 1/include/linux/iomap.h
--- 2/include/linux/iomap.h
+++ b/include/linux/iomap.h
@@@ -22,7 -22,7 +22,8 @@@ struct vm_fault
   * Flags for iomap mappings:
   */
  #define IOMAP_F_MERGED        0x01    /* contains multiple blocks/extents */
 -#define IOMAP_F_NEW   0x02    /* blocks have been newly allocated */
 +#define IOMAP_F_SHARED        0x02    /* block shared with another file */
++#define IOMAP_F_NEW   0x04    /* blocks have been newly allocated */
  
  /*
   * Magic value for blkno: