Received-SPF: pass (google.com: domain of linux-kernel+bounces-57288-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Date: Thu, 8 Feb 2024 09:59:06 +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: linux-next: manual merge of the vfs-brauner tree with the cifs tree
Message-ID: <20240208095906.18567844@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/DZJ_LM+4DGfnbd2qs_vcJaB";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi all,

Today's linux-next merge of the vfs-brauner tree got a conflict in:

  fs/smb/client/file.c

between commit:

  ddcd663e2c76 ("cifs: Remove some code that's no longer used, part 2")

from the cifs tree and commit:

  a69ce85ec9af ("filelock: split common fields into struct file_lock_core")

from the vfs-brauner tree.

I fixed it up (this was caused by a pure white space change in the
latter commit on a line that was removed in the former anyway, so I
just used the former) 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_/DZJ_LM+4DGfnbd2qs_vcJaB
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXECzoACgkQAVBC80lX
0Gzo0Af9Hmvu22w17Vji1ztQuO6D+u590Tev/8qnb0B0uOGAZThZt0FxVjEDWcBi
9aELZq4OATjlRAHvjzQVlkMJOm0hspvQZH+nuV4MIMlGvbExuWz1rYULFm5rgfNL
C0fNIDZTOKEl3QAQBmKAeutActnkGnXywzLGmkYPlUxSRv0NSS7bWvCrNtkdEVaQ
JCUREjh57OZ50DiIGTgF/bcxMM3p0bWITQVGq+APelvyTd4wM/wQi/GP+NR5CqAA
+Qc9y44QF2bdcFTA07Pu2ku6M6InfNd62HQ5WXcPWoeXgPrQclcEwcjFitszyZlz
u5mTcarm3qCel0XpeafUztLyH3qRzQ==
=+Pe3
-----END PGP SIGNATURE-----

--Sig_/DZJ_LM+4DGfnbd2qs_vcJaB--