linux-next: manual merge of the nfsd tree with the exfat tree

[Mark Brown]

Hi all,

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

  fs/exfat/file.c

between commit:

  614f71ca1bdfa ("exfat: add iomap buffered I/O support")

from the exfat tree and commit:

  27e0b573dd4aa ("exfat: Implement fileattr_get for case sensitivity")

from the nfsd 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.

diff --cc fs/exfat/file.c
index e6e58584f567a,91e5511945d11..0000000000000
--- a/fs/exfat/file.c
+++ b/fs/exfat/file.c
@@@ -14,7 -14,7 +14,8 @@@
  #include <linux/writeback.h>
  #include <linux/filelock.h>
  #include <linux/falloc.h>
 +#include <linux/iomap.h>
+ #include <linux/fileattr.h>
  
  #include "exfat_raw.h"
  #include "exfat_fs.h"

Attachment: signature.asc
Description: PGP signature