Date:   Fri, 3 Dec 2021 09:41:39 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Steve French <smfrench@gmail.com>,
        CIFS <linux-cifs@vger.kernel.org>,
        David Howells <dhowells@redhat.com>
Cc:     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: linux-next: manual merge of the cifs tree with the fscache tree
Message-ID: <20211203094139.059541cd@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/K_eCIX1EeiRLUj2YMHc5lM+";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/K_eCIX1EeiRLUj2YMHc5lM+
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the cifs tree got conflicts in:

  fs/cifs/connect.c
  fs/cifs/fscache.c

between commit:

  935b45107a80 ("cifs: Support fscache indexing rewrite (untested)")

from the fscache tree and commits:

  9d0245fc6a2e ("cifs: wait for tcon resource_id before getting fscache sup=
er")
  c148f8eb032f ("cifs: add server conn_id to fscache client cookie")
  b1f962ba272b ("cifs: avoid use of dstaddr as key for fscache client cooki=
e")

from the cifs tree.

I fixed it up (I just used the former versions) 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

--Sig_/K_eCIX1EeiRLUj2YMHc5lM+
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmGpS6MACgkQAVBC80lX
0Gzzywf/S1ePVXdZnC0QO6fcU/w/irn0NN9Piu2lnsURSO7eLH0/ZFhv+6m2XmaW
NLBSoh5NjVZUPgwsOXKugOEkVBGh7OQFlnw5lbclr+EViD4na1d7ckqbPLjBbAEo
gmbeNWaQSe3Kx3igLNBL9AcTyGv5l59DkTcfSwA13nzNkSGIWQ0E1LQMVIjnMwTe
X5JylpmVpEU/T3WZGMyVY2cNSolCdJdQi25aniCvIWDdLGY7ZOu4kbXzaujrv3pE
HKnxcGXc1GMt7XOskaHqPtfWBd0GcENVyExVyFsLR5OY4pwtCTF5cURrTW6aIgNm
/VKa/9X9mAe1PpHhHftRC+qM5vkkjA==
=4SXJ
-----END PGP SIGNATURE-----

--Sig_/K_eCIX1EeiRLUj2YMHc5lM+--