* linux-next: manual merge of the file-locks tree with the uuid tree
@ 2017-06-21 0:10 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2017-06-21 0:10 UTC (permalink / raw)
To: Jeff Layton, Christoph Hellwig
Cc: Linux-Next Mailing List, Linux Kernel Mailing List
Hi Jeff,
Today's linux-next merge of the file-locks tree got a conflict in:
include/linux/fs.h
between commit:
85787090a21e ("fs: switch ->s_uuid to uuid_t")
from the uuid tree and commit:
7356fd927059 ("fs: new infrastructure for writeback error handling and reporting")
from the file-locks 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/fs.h
index 3e68cabb8457,df30536e2e57..000000000000
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -30,8 -30,7 +30,8 @@@
#include <linux/percpu-rwsem.h>
#include <linux/workqueue.h>
#include <linux/delayed_call.h>
+#include <linux/uuid.h>
-
+ #include <linux/errseq.h>
#include <asm/byteorder.h>
#include <uapi/linux/fs.h>
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2017-06-21 0:10 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-21 0:10 linux-next: manual merge of the file-locks tree with the uuid 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