From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the xfs tree with Linus' tree Date: Wed, 31 Oct 2018 11:22:44 +1100 Message-ID: <20181031112244.71b62e67@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/UUSPbcXU+t.755lGC47ucM="; protocol="application/pgp-signature" Return-path: Sender: linux-kernel-owner@vger.kernel.org To: "Darrick J. Wong" , David Chinner , linux-xfs@vger.kernel.org Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Al Viro List-Id: linux-next.vger.kernel.org --Sig_/UUSPbcXU+t.755lGC47ucM= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the xfs tree got a conflict in: Documentation/filesystems/porting between commit: 1a16dbaf798c ("Document d_splice_alias() calling conventions for ->lookup= () users.") from Linus' tree and commit: 2e5dfc99f2e6 ("vfs: combine the clone and dedupe into a single remap_file= _range") from the xfs 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. --=20 Cheers, Stephen Rothwell diff --cc Documentation/filesystems/porting index 321d74b73937,e6d4466268dd..000000000000 --- a/Documentation/filesystems/porting +++ b/Documentation/filesystems/porting @@@ -623,13 -623,7 +623,18 @@@ in your dentry operations instead On success you get a new struct file sharing the mount/dentry with the original, on failure - ERR_PTR(). -- +[recommended] + ->lookup() instances doing an equivalent of + if (IS_ERR(inode)) + return ERR_CAST(inode); + return d_splice_alias(inode, dentry); + don't need to bother with the check - d_splice_alias() will do the + right thing when given ERR_PTR(...) as inode. Moreover, passing NULL + inode to d_splice_alias() will also do the right thing (equivalent of + d_add(dentry, NULL); return NULL;), so that kind of special cases + also doesn't need a separate treatment. ++-- + [mandatory] + ->clone_file_range() and ->dedupe_file_range have been replaced with + ->remap_file_range(). See Documentation/filesystems/vfs.txt for more + information. --Sig_/UUSPbcXU+t.755lGC47ucM= Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlvY9dQACgkQAVBC80lX 0GwAnAf/W1trKamURUrsaeJdnjHRf6Ln93h+z9RzjBgCx7tIRK+HvGVwQuUVgsjK WUtZasJffW18z0jS1673oCBvKe5hhZ3AZIhuyA++m0FXfPAKYnQaCC/eJzO4yE4y 6Pp9Pheu98Z+FP8sSSLMNGo0US1cGAIX2JRLBA1gthfZtn5a6d81iNtTjd+div0H cfF2iodUtSeE9B2blhAYeNjR9rPnSJ08L7QdB5D33nG2k78WSdnD7P+CCkE5dyV3 oPqorp0aA+7Y2gJ/b8FC1QQdJNFo+udolKFpyVOvtZE4vAgOz4kOuPT8rjhYQFet pObV1nOay8DCtw77yWzD8OsNDg0pFQ== =MLav -----END PGP SIGNATURE----- --Sig_/UUSPbcXU+t.755lGC47ucM=--