From: Dave Chinner <david@fromorbit.com>
Date: Wed, 9 Nov 2016 23:29:06 +0000 (+1100)
Subject: Merge branch 'dax-4.10-iomap-pmd' into for-next
X-Git-Tag: v4.14-rc1~1875^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b649c42e25b7d1be86d9dade8674dec3d64138fb;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'dax-4.10-iomap-pmd' into for-next
---

b649c42e25b7d1be86d9dade8674dec3d64138fb
diff --cc include/linux/iomap.h
index 7892f55,b9e7b8e..f185156
--- a/include/linux/iomap.h
+++ b/include/linux/iomap.h
@@@ -46,9 -42,9 +46,10 @@@ struct iomap 
  /*
   * Flags for iomap_begin / iomap_end.  No flag implies a read.
   */
 -#define IOMAP_WRITE		(1 << 0)
 -#define IOMAP_ZERO		(1 << 1)
 +#define IOMAP_WRITE		(1 << 0) /* writing, must allocate blocks */
 +#define IOMAP_ZERO		(1 << 1) /* zeroing operation, may skip holes */
 +#define IOMAP_REPORT		(1 << 2) /* report extent status, e.g. FIEMAP */
+ #define IOMAP_FAULT		(1 << 3) /* mapping for page fault */
  
  struct iomap_ops {
  	/*