From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752689AbeAYEmZ (ORCPT ); Wed, 24 Jan 2018 23:42:25 -0500 Received: from ozlabs.org ([103.22.144.67]:59681 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933369AbeAYEmV (ORCPT ); Wed, 24 Jan 2018 23:42:21 -0500 Date: Thu, 25 Jan 2018 15:42:13 +1100 From: Stephen Rothwell To: Jeff Layton , "J. Bruce Fields" Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Amir Goldstein Subject: linux-next: manual merge of the iversion tree with the nfsd tree Message-ID: <20180125154213.19909bab@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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; }