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

[Stephen Rothwell]

Hi Jeff,

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

  fs/nfsd/nfsfh.h

between commit:

  3ac71a649c3d ("nfsd: store stat times in fill_pre_wcc() instead of inode times")

from the nfsd tree and commit:

  8ace40dfbdf4 ("nfsd: convert to new i_version API")

from the iversion 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/nfsd/nfsfh.h
index 99be87b50ebe,b8444189223b..000000000000
--- a/fs/nfsd/nfsfh.h
+++ b/fs/nfsd/nfsfh.h
@@@ -257,10 -257,10 +258,10 @@@ static inline u64 nfsd4_change_attribut
  {
  	u64 chattr;
  
 -	chattr =  inode->i_ctime.tv_sec;
 +	chattr =  stat->ctime.tv_sec;
  	chattr <<= 30;
 -	chattr += inode->i_ctime.tv_nsec;
 +	chattr += stat->ctime.tv_nsec;
- 	chattr += inode->i_version;
+ 	chattr += inode_query_iversion(inode);
  	return chattr;
  }