From: Andrew Morton <akpm@linux-foundation•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Luis Chamberlain <mcgrof@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
"Mike Rapoport (IBM)" <rppt@kernel•org>,
Suren Baghdasaryan <surenb@google•com>,
Kent Overstreet <kent.overstreet@linux•dev>
Subject: Re: linux-next: manual merge of the modules tree with the mm tree
Date: Wed, 24 Apr 2024 13:07:57 -0700 [thread overview]
Message-ID: <20240424130757.531be2842c505a62246d180c@linux-foundation.org> (raw)
In-Reply-To: <20240424123935.2f65e886@canb.auug.org.au>
On Wed, 24 Apr 2024 12:39:35 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi all,
>
> 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.
Suren&Kent, please review (and preferably) test Stephen's handiwork in
linux-next?
next prev parent reply other threads:[~2024-04-24 20:07 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 [this message]
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
-- 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=20240424130757.531be2842c505a62246d180c@linux-foundation.org \
--to=akpm@linux-foundation$(echo .)org \
--cc=kent.overstreet@linux$(echo .)dev \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mcgrof@kernel$(echo .)org \
--cc=rppt@kernel$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=surenb@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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