Hi all,

Today's linux-next merge of the vfs-brauner tree got a conflict in:

  fs/fat/dir.c

between commit:

  30034bbf280f ("kernel.h: drop hex.h and update all hex.h users")

from the mm-nonmm-unstable tree and commit:

  a9acc8422ffb ("fat: add setlease file operation")

from the vfs-brauner 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/fat/dir.c
index af7dedf8adcb,07d95f1442c8..000000000000
--- a/fs/fat/dir.c
+++ b/fs/fat/dir.c
@@@ -16,7 -16,7 +16,8 @@@
  
  #include <linux/slab.h>
  #include <linux/compat.h>
 +#include <linux/hex.h>
+ #include <linux/filelock.h>
  #include <linux/uaccess.h>
  #include <linux/iversion.h>
  #include "fat.h"