From: Theodore Ts'o <tytso@mit.edu>
Date: Mon, 14 Nov 2016 03:02:15 +0000 (-0500)
Subject: Merge branch 'dax-4.10-iomap-pmd' into origin
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a2f6d9c4c081ec2a02529b8af2c04f3e557a3a3e;p=linux-beck.git

Merge branch 'dax-4.10-iomap-pmd' into origin
---

a2f6d9c4c081ec2a02529b8af2c04f3e557a3a3e
diff --cc include/linux/iomap.h
index 7892f55a1866,b9e7b8ec8c1d..f185156de74d
--- 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 {
  	/*