Date:   Mon, 20 Dec 2021 10:46:10 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     David Howells <dhowells@redhat.com>
Cc:     broonie@kernel.org, Steve French <smfrench@gmail.com>,
        CIFS <linux-cifs@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Shyam Prasad N <sprasad@microsoft.com>,
        Steve French <stfrench@microsoft.com>
Subject: Re: linux-next: manual merge of the cifs tree with the fscache tree
Message-ID: <20211220104610.5f074aec@canb.auug.org.au>
In-Reply-To: <20211216124317.4143405-1-broonie@kernel.org>
References: <20211216124317.4143405-1-broonie@kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/9RwpTx/TZjurmp4EB2a1cba";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/9RwpTx/TZjurmp4EB2a1cba
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Thu, 16 Dec 2021 12:43:17 +0000 broonie@kernel.org wrote:
>
> Today's linux-next merge of the cifs tree got a conflict in:
>=20
>   fs/cifs/inode.c
>=20
> between commit:
>=20
>   830c476f5eb82 ("cifs: Support fscache indexing rewrite (untested)")
>=20
> from the fscache tree and commit:
>=20
>   68f87ec9c1ce3 ("cifs: ignore resource_id while getting fscache super co=
okie")

This is now commit

  b774302e8856 ("cifs: ignore resource_id while getting fscache super cooki=
e")

in Linus' tree.

> from the cifs tree.
>=20
> diff --cc fs/cifs/inode.c
> index dc2fe76450b96,279622e4eb1c2..0000000000000
> --- a/fs/cifs/inode.c
> +++ b/fs/cifs/inode.c
> @@@ -1372,20 -1370,6 +1367,7 @@@ iget_no_retry
>   		iget_failed(inode);
>   		inode =3D ERR_PTR(rc);
>   	}
>  +
> - 	if (!rc) {
> - 		/*
> - 		 * The cookie is initialized from volume info returned above.
> - 		 * Inside cifs_fscache_get_super_cookie it checks
> - 		 * that we do not get super cookie twice.
> - 		 */
> - 		rc =3D cifs_fscache_get_super_cookie(tcon);
> - 		if (rc < 0) {
> - 			iget_failed(inode);
> - 			inode =3D ERR_PTR(rc);
> - 		}
> - 	}
> -=20
>   out:
>   	kfree(path);
>   	free_xid(xid);

so this is now a conflict between the fscache tree and Linus's tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/9RwpTx/TZjurmp4EB2a1cba
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmG/xEIACgkQAVBC80lX
0Gz32Af+JYzcgRqXkzVcfP/tAeLSjgkA0q3fyqVZhXJOkyBzc2LTMi7AhEiDKCAJ
S8Mm/Wa/N8ISV5c81wP5RJr5ClD1kcyHjo2bcD1q0dmEmTyume8YoXO/neVZjHdA
ceRiAf3CEZnGgE05xWtaYcudBBveJ+8OuayLn4Be6ePRlbfNwPy8R2J4+QScxqMD
5vO7SX0jTDErUS6ObY+yxhfC6ZEQoYg3Kh+b+ilyFyMqNqT9rz8Vvdg8iVGSLxiZ
4RkqhSyz2LWnXwLu72OYMMhZ2c2tgBJQw3cZbkFSeAOPF2lW4qmDHNP6oanxdCjg
AGW8iLnDlf4EHyZlX8Cjz1arF96ghA==
=d0KT
-----END PGP SIGNATURE-----

--Sig_/9RwpTx/TZjurmp4EB2a1cba--