Received-SPF: pass (google.com: domain of linux-kernel+bounces-157912-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Thu, 25 Apr 2024 11:37:55 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Suren Baghdasaryan <surenb@google.com>
Cc: Mike Rapoport <rppt@kernel.org>, Andrew Morton
 <akpm@linux-foundation.org>, Luis Chamberlain <mcgrof@kernel.org>, Linux
 Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Kent Overstreet <kent.overstreet@linux.dev>
Subject: Re: linux-next: manual merge of the modules tree with the mm tree
Message-ID: <20240425113755.250be7a3@canb.auug.org.au>
In-Reply-To: <CAJuCfpFT7tBigfSEO2iGKn5YtB0hFgVF-2Sfh+60nAO7drCeqg@mail.gmail.com>
References: <20240424123935.2f65e886@canb.auug.org.au>
	<20240424130757.531be2842c505a62246d180c@linux-foundation.org>
	<ZilrutXaEB0laSvr@kernel.org>
	<CAJuCfpFmZmw-CW17OWjmxzh5BdXsc7a_1HcdEL7kmLTZDpU5kw@mail.gmail.com>
	<CAJuCfpFT7tBigfSEO2iGKn5YtB0hFgVF-2Sfh+60nAO7drCeqg@mail.gmail.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/7PyCfeDXf3+o=7JLC8gWN/v";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/7PyCfeDXf3+o=7JLC8gWN/v
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

Hi all,

On Wed, 24 Apr 2024 21:24:06 +0000 Suren Baghdasaryan <surenb@google.com> w=
rote:
>
> On Wed, Apr 24, 2024 at 8:33=E2=80=AFPM Suren Baghdasaryan <surenb@google=
com> wrote:
> >
> > On Wed, Apr 24, 2024 at 1:31=E2=80=AFPM Mike Rapoport <rppt@kernel.org>=
 wrote: =20
> > >
> > > On Wed, Apr 24, 2024 at 01:07:57PM -0700, Andrew Morton wrote: =20
> > > > On Wed, 24 Apr 2024 12:39:35 +1000 Stephen Rothwell <sfr@canb.auug.=
org.au> wrote:
> > > > =20
> > > > > Today's linux-next merge of the modules tree got a conflict in:
> > > > >
> > > > >   kernel/module/main.c
> > > > >
> > > > > between commits:
> > > > >
> > > > >   7f014cdda4cb ("lib: code tagging module support")
> > > > >   5ab9b0c7ea5c ("lib: prevent module unloading if memory is not f=
reed")
> > > > >
> > > > > from the mm-unstable branch of the mm tree and commits:
> > > > >
> > > > >   0746f9982603 ("module: make module_memory_{alloc,free} more sel=
f-contained")
> > > > >   18da532eefc8 ("mm/execmem, arch: convert remaining overrides of=
 module_alloc to execmem")
> > > > >
> > > > > from the modules tree.
> > > > >
> > > > > I fixed it up (I think, see below) and can carry the fix as
> > > > > necessary. This is now fixed as far as linux-next is concerned, b=
ut any
> > > > > non trivial conflicts should be mentioned to your upstream mainta=
iner
> > > > > when your tree is submitted for merging.  You may also want to co=
nsider
> > > > > cooperating with the maintainer of the conflicting tree to minimi=
se any
> > > > > particularly complex conflicts. =20
> > > >
> > > > That's a shame.  I don't see much that we can do to reduce the dama=
ge here. =20
> > >
> > > I can rebase it on mm-unstable and this can go via the mm tree. =20
> >
> > Conflict resolution looks fine to me. I'll run relevant tests on
> > linux-next within 2 hours. =20
>=20
> Tests are passing and module loading/unloading works fine on linux-next.

Unfortunately, due to a failure in my boot tests, the new (conficting)
part of the modules tree was not included in linux-next yesterday.

See https://lore.kernel.org/all/20240424183503.2a6ce847@canb.auug.org.au/

--=20
Cheers,
Stephen Rothwell

--Sig_/7PyCfeDXf3+o=7JLC8gWN/v
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYps/MACgkQAVBC80lX
0Gwjlgf+KCHOGHKaEjvfnP0CILSxh12Y66mDzqxlte021U/UdtJlx2byfxzDn/r3
QLRNcXU4pT4GBYRXiYf2J3UeHNoz4qTKRIhlCep4L6qW0guUDu6Gw1NroALXI1We
u8ZjUlH5jps86x+uxUZdCmIVwcGOt8L7a75HzaGphCxSUdS6SuC/lhEV6ETkYtyT
0jt8TF5h1Gyw3B5cm8PEA9EZBSgdm9oTGJDWIYwQwLmDFZhoeZJKpE1WqszjiUW/
Vfg5+HWCId44qpplNI4fwYeJ8LjgWsHBTuR4e5pSWUw2yGQ5mcSYmMWoWnivdu3s
YLnCiJf9/SvmBgOHgFl2FLXYS1dG9g==
=dGZj
-----END PGP SIGNATURE-----

--Sig_/7PyCfeDXf3+o=7JLC8gWN/v--