Received-SPF: pass (google.com: domain of linux-kernel+bounces-41975-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Mon, 29 Jan 2024 08:53:01 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Shuah Khan <shuah@kernel.org>, Andrew Morton <akpm@linux-foundation.org>
Cc: "Hu.Yadi" <hu.yadi@h3c.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Muhammad Usama Anjum
 <usama.anjum@collabora.com>, Shuah Khan <skhan@linuxfoundation.org>
Subject: linux-next: manual merge of the kselftest-fixes tree with the
 mm-hotfixes tree
Message-ID: <20240129085301.5458880a@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/BhzWz.dN6KBzdwan9nN4ZKz";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/BhzWz.dN6KBzdwan9nN4ZKz
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the kselftest-fixes tree got a conflict in:

  tools/testing/selftests/core/close_range_test.c

between commit:

  27a593e3f13a ("selftests: core: include linux/close_range.h for CLOSE_RAN=
GE_* macros")

from the mm-hotfixes-unstable branch of the mm-hotfixes tree and commit:

  b5a8a6de69bc ("selftests/core: Fix build issue with CLOSE_RANGE_UNSHARE")

from the kselftest-fixes tree.

I fixed it up (basically the same patch, I used the former which kept
the blank line) 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_/BhzWz.dN6KBzdwan9nN4ZKz
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmW2zL0ACgkQAVBC80lX
0Gx1Qwf/dH0jDQMJIhLy2JVgJShYzAqq/jEkeDOtAXGJ8Q49S04vU8xk5/+L8rMf
TgWtWTiXIgsezYftqYnTbOz6nczn51mKS15B5b7xzY2HSIeroMEonY+K9sJ3C8PO
F0MRlSbw1t4jO/E4XhKX6ZmkOAW4fzvJWJTzL4QjowbA8gHYI3kVV4yxxWmfRPGm
Ihq6K3wXIt73YFfr7gudz93o2VVIUc7dvlT7zBQ4so7Gabn/J94FUObGleULUtKS
HwK/VwpiTm8qA9kOvVh0IJhtX4lP/9DQcC6qV5Lo6ExglRYOKueXvDxFTH4kBkUv
zxZgt0k9ZQodTRXIVpLgzHXJP1oIGg==
=IBZo
-----END PGP SIGNATURE-----

--Sig_/BhzWz.dN6KBzdwan9nN4ZKz--