* linux-next: manual merge of the nvdimm tree with the gfs2 tree
@ 2017-11-03 7:04 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2017-11-03 7:04 UTC (permalink / raw)
To: Dan Williams, Steven Whitehouse, Bob Peterson
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Jan Kara,
Andreas Gruenbacher
Hi Dan,
Today's linux-next merge of the nvdimm tree got a conflict in:
include/linux/iomap.h
between commit:
3974320ca6aa ("GFS2: Implement iomap for block_map")
from the gfs2 tree and commit:
2bc34066c0d4 ("dax, iomap: Add support for synchronous faults")
from the nvdimm tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc include/linux/iomap.h
index ca10767ab73d,73e3b7085dbe..000000000000
--- a/include/linux/iomap.h
+++ b/include/linux/iomap.h
@@@ -22,8 -21,12 +22,13 @@@ struct vm_fault
/*
* Flags for all iomap mappings:
*/
-#define IOMAP_F_NEW 0x01 /* blocks have been newly allocated */
+#define IOMAP_F_NEW 0x01 /* blocks have been newly allocated */
+#define IOMAP_F_BOUNDARY 0x02 /* mapping ends at metadata boundary */
+ /*
+ * IOMAP_F_DIRTY indicates the inode has uncommitted metadata needed to access
+ * written data and requires fdatasync to commit them to persistent storage.
+ */
-#define IOMAP_F_DIRTY 0x02
++#define IOMAP_F_DIRTY 0x04
/*
* Flags that only need to be reported for IOMAP_REPORT requests:
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2017-11-03 7:04 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-03 7:04 linux-next: manual merge of the nvdimm tree with the gfs2 tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox