Subject: linux-next: manual merge of the file-locks tree with the uuid tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 21 Jun 2017 10:10:24 +1000

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>