Re: linux-next: manual merge of the modules tree with the mm tree

[Stephen Rothwell]

Hi all,

On Wed, 24 Apr 2024 21:24:06 +0000 Suren Baghdasaryan <surenb@xxxxxxxxxx> wrote:
>
> On Wed, Apr 24, 2024 at 8:33 PM Suren Baghdasaryan <surenb@googlecom> wrote:
> >
> > On Wed, Apr 24, 2024 at 1:31 PM Mike Rapoport <rppt@xxxxxxxxxx> wrote:  
> > >
> > > On Wed, Apr 24, 2024 at 01:07:57PM -0700, Andrew Morton wrote:  
> > > > On Wed, 24 Apr 2024 12:39:35 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> > > >  
> > > > > 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 freed")
> > > > >
> > > > > from the mm-unstable branch of the mm tree and commits:
> > > > >
> > > > >   0746f9982603 ("module: make module_memory_{alloc,free} more self-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, 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.  
> > > >
> > > > That's a shame.  I don't see much that we can do to reduce the damage here.  
> > >
> > > I can rebase it on mm-unstable and this can go via the mm tree.  
> >
> > Conflict resolution looks fine to me. I'll run relevant tests on
> > linux-next within 2 hours.  
> 
> 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@xxxxxxxxxxxxxxxx/

-- 
Cheers,
Stephen Rothwell

Attachment: pgpJL1Mt7bWVN.pgp
Description: OpenPGP digital signature