Hi David,
Today's linux-next merge of the btrfs-kdave tree got a conflict in:
fs/btrfs/tree-log.c
between commit:
c7f88c4e78f5 ("btrfs: convert to new i_version API")
from Linus' tree and commit:
8bd2a9b19fd7 ("btrfs: Remove custom crc32c init code")
from the btrfs-kdave 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 fs/btrfs/tree-log.c
index afadaadab18e,df8e76d01dbe..000000000000
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@@ -20,7 -20,7 +20,8 @@@
#include <linux/slab.h>
#include <linux/blkdev.h>
#include <linux/list_sort.h>
+#include <linux/iversion.h>
+ #include "ctree.h"
#include "tree-log.h"
#include "disk-io.h"
#include "locking.h"
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
