Hi,
Today's linux-next merge of the nfsd tree got a conflict in
include/linux/nfs4.h between commit d67ae825a59d ("pnfs/flexfiles: Add
the FlexFile Layout Driver") from the nfs tree and commit 6cae0a4648c0
("nfs: add LAYOUT_TYPE_MAX enum value") from the nfsd tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc include/linux/nfs4.h
index de7c91ca427e,bc10d687f2ce..000000000000
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@@ -516,7 -517,7 +517,8 @@@ enum pnfs_layouttype
LAYOUT_NFSV4_1_FILES = 1,
LAYOUT_OSD2_OBJECTS = 2,
LAYOUT_BLOCK_VOLUME = 3,
+ LAYOUT_FLEX_FILES = 4,
+ LAYOUT_TYPE_MAX
};
/* used for both layout return and recall */
Attachment:
pgpW2bJBUKU6o.pgp
Description: OpenPGP digital signature
