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
Date: Thu, 25 Apr 2024 11:37:55 +1000 [thread overview]
Message-ID: <20240425113755.250be7a3@canb.auug.org.au> (raw)
In-Reply-To: <CAJuCfpFT7tBigfSEO2iGKn5YtB0hFgVF-2Sfh+60nAO7drCeqg@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 2163 bytes --]
Hi all,
On Wed, 24 Apr 2024 21:24:06 +0000 Suren Baghdasaryan <surenb@google.com> wrote:
>
> On Wed, Apr 24, 2024 at 8:33 PM Suren Baghdasaryan <surenb@google.com> wrote:
> >
> > On Wed, Apr 24, 2024 at 1:31 PM Mike Rapoport <rppt@kernel.org> 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@canb.auug.org.au> 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@canb.auug.org.au/
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2024-04-25 1:38 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-24 2:39 linux-next: manual merge of the modules tree with the mm tree Stephen Rothwell
2024-04-24 20:07 ` Andrew Morton
2024-04-24 20:17 ` Suren Baghdasaryan
2024-04-24 20:29 ` Mike Rapoport
2024-04-24 20:33 ` Suren Baghdasaryan
2024-04-24 21:24 ` Suren Baghdasaryan
2024-04-25 1:37 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-04-24 2:20 Stephen Rothwell
2024-05-16 23:26 ` Stephen Rothwell
2024-04-12 2:04 Stephen Rothwell
2024-05-16 23:23 ` Stephen Rothwell
2024-05-16 23:35 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240425113755.250be7a3@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=kent.overstreet@linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mcgrof@kernel.org \
--cc=rppt@kernel.org \
--cc=surenb@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).