linux-next: manual merge of the nvdimm tree with the xfs tree

[Stephen Rothwell]

Hi Dan,

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

  fs/xfs/xfs_inode.h

between commit:

  f5c54717bf2b ("xfs: remove xfs_zero_range")

from the xfs tree and commit:

  6ea4108852e9 ("xfs: prepare xfs_break_layouts() for another layout type")

from the nvdimm 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/xfs/xfs_inode.h
index 132d8aa2afc4,6951d57aae71..000000000000
--- a/fs/xfs/xfs_inode.h
+++ b/fs/xfs/xfs_inode.h
@@@ -443,6 -457,12 +457,8 @@@ enum xfs_prealloc_flags 
  
  int	xfs_update_prealloc_flags(struct xfs_inode *ip,
  				  enum xfs_prealloc_flags flags);
 -int	xfs_zero_eof(struct xfs_inode *ip, xfs_off_t offset,
 -		     xfs_fsize_t isize, bool *did_zeroing);
 -int	xfs_zero_range(struct xfs_inode *ip, xfs_off_t pos, xfs_off_t count,
 -		bool *did_zero);
+ int	xfs_break_layouts(struct inode *inode, uint *iolock,
+ 		enum layout_break_reason reason);
  
  /* from xfs_iops.c */
  extern void xfs_setup_inode(struct xfs_inode *ip);

Attachment: pgpMIt5dLfuhc.pgp
Description: OpenPGP digital signature