From: Dave Chinner <david@fromorbit.com>
Date: Sun, 2 Oct 2016 22:53:59 +0000 (+1100)
Subject: Merge branch 'iomap-4.9-dax' into for-next
X-Git-Tag: v6.1~15622^2~72
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a1f45e668e14c26b4700b1936c5a41b58cc4ac74;p=sdk%2Femulator%2Femulator-kernel.git

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

a1f45e668e14c26b4700b1936c5a41b58cc4ac74
diff --cc include/linux/iomap.h
index c74226a738a3,14d7067f8b06..e63e288dee83
--- a/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: