Received-SPF: pass (google.com: domain of linux-kernel+bounces-99809-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Date: Tue, 12 Mar 2024 15:00:01 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christian Brauner <brauner@kernel.org>, Steve French
 <smfrench@gmail.com>
Cc: David Howells <dhowells@redhat.com>, Jeff Layton <jlayton@kernel.org>,
 CIFS <linux-cifs@vger.kernel.org>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Steve French <stfrench@microsoft.com>
Subject: Re: linux-next: manual merge of the vfs-brauner tree with the cifs
 tree
Message-ID: <20240312150001.471d3d94@canb.auug.org.au>
In-Reply-To: <20240226110343.28e340eb@canb.auug.org.au>
References: <20240226110343.28e340eb@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/N44fLK/yQcRJfrUddlD0fgT";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi all,

On Mon, 26 Feb 2024 11:03:43 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Today's linux-next merge of the vfs-brauner tree got a conflict in:
>=20
>   fs/smb/client/file.c
>=20
> between commit:
>=20
>   d7e87923939a ("cifs: Fix writeback data corruption")
>=20
> from the cifs tree and commit:
>=20
>   a69ce85ec9af ("filelock: split common fields into struct file_lock_core=
")
>=20
> from the vfs-brauner tree.
>=20
> Please do not do unrelated white space cleanups ...
>=20
> I fixed it up (I used the former version) 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.

This is now a conflict between the cifs tree and Linus' tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/N44fLK/yQcRJfrUddlD0fgT
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXv00EACgkQAVBC80lX
0Gz45Qf/UDETD9m+M72hF/5WefZSbb6LRz09k8PyMM9r0PMZhi5wA7DKVMWWT6rV
ODAz8JnjUvv2j/Q2bPDCrhV+S0kE+D1rJ4V46aZYABA4Bcrl2fGp3ujSWzI+r5gP
U0s2UVFcgzdB1iNLtj+M72T/qDxvQQ+PSSn+f+dc5L1axvwZtxm2LXghHTlkWwNs
C9fAORLlnX/OG+SG8cbPZSbYsBIG58lwX14iFV/DchHSzOp8CxJfeLDsiThGwlnW
8PEhEMjTZgiSWOhsKenRHrfqS6bPoKkw5WkdvO4l+BucvlOcAMfG2XwMD1eOat5w
xbd36kNPKulgq69T+BSwLhKv5NPLTA==
=N9Cd
-----END PGP SIGNATURE-----

--Sig_/N44fLK/yQcRJfrUddlD0fgT--