Received-SPF: pass (google.com: domain of linux-kernel+bounces-209151-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: Tue, 11 Jun 2024 11:20:46 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>, David Miller
 <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni
 <pabeni@redhat.com>, Networking <netdev@vger.kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next
 Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the tomoyo tree with the net-next tree
Message-ID: <20240611112046.1d388eae@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/NmrhB/rGJ4ubXrctjEVxLYa";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi all,

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

  net/netlink/af_netlink.c

between commits:

  5380d64f8d76 ("rtnetlink: move rtnl_lock handling out of af_netlink")
  5fbf57a937f4 ("net: netlink: remove the cb_mutex "injection" from netlink=
 core")

from the net-next tree and commit:

  c2bfadd666b5 ("rtnetlink: print rtnl_mutex holder/waiter for debug purpos=
e")

from the tomoyo tree.

I fixed it up (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.

It looks like the tomoyo tree commit should just be completely dropped?
--=20
Cheers,
Stephen Rothwell

--Sig_/NmrhB/rGJ4ubXrctjEVxLYa
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZnpm4ACgkQAVBC80lX
0GwiWAf/dZp0iC5CaGqTg+J3jHa+LDyDCAu8r4UJgWEQhFbXy0Xep3Ej8tH+xYZn
yanA8pQQ7ArdltXNh2d+V9bt9RkeenpgtbojDO2kpWrpAl7C/VN++4wMn5XPy5bV
WXTxt+Ul5Aeou+qXt2y4UrP8KdTUR6Fxq43MmP3mQFW+rRUtO2/LnI57PEI2Kp1r
Ekonh+oYIJOvlfn/Z2fbT8y9EzccrYbI/PHXVnPdQGbD9lNLNzDN83B1t38RkXAZ
9xIRqEkHvb1eVPQwz+2vLUU80vvaIG/fhpX8uIKddf2lBd0cWYpcUUYhrd3U4Gtf
imG20D+thxMIxOUZ2u4KU0P6BP8qZA==
=SPO1
-----END PGP SIGNATURE-----

--Sig_/NmrhB/rGJ4ubXrctjEVxLYa--