From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mike Rapoport <rppt@kernel•org>,
Andrew Morton <akpm@linux-foundation•org>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Pasha Tatashin <pasha.tatashin@soleen•com>,
Usama Arif <usamaarif642@gmail•com>
Subject: Re: linux-next: manual merge of the memblock tree with the mm-nonmm-stable tree
Date: Fri, 5 Dec 2025 10:00:07 +1100 [thread overview]
Message-ID: <20251205100007.734b0089@canb.auug.org.au> (raw)
In-Reply-To: <20251201123722.19e5f034@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2022 bytes --]
Hi all,
On Mon, 1 Dec 2025 12:37:22 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the memblock tree got a conflict in:
>
> kernel/Kconfig.kexec
>
> between commit:
>
> 48a1b2321d76 ("liveupdate: kho: move to kernel/liveupdate")
>
> from the mm-nonmm-stable tree and commit:
>
> ab65699f9add ("memblock: remove CONFIG_MEMBLOCK_KHO_SCRATCH option")
>
> from the memblock tree.
>
> I fixed it up (I used the former version of the above file and then
> added the following merge resolution patch) 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.
>
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Mon, 1 Dec 2025 12:33:52 +1100
> Subject: [PATCH] fix for "memblock: remove CONFIG_MEMBLOCK_KHO_SCRATCH option"
>
> interacting with commit
>
> 48a1b2321d76 ("liveupdate: kho: move to kernel/liveupdate")
>
> from the mm-nonmm-stable tree.
>
> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> ---
> kernel/liveupdate/Kconfig | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/kernel/liveupdate/Kconfig b/kernel/liveupdate/Kconfig
> index 9b2515f31afb..86a58eaf433a 100644
> --- a/kernel/liveupdate/Kconfig
> +++ b/kernel/liveupdate/Kconfig
> @@ -7,7 +7,6 @@ config KEXEC_HANDOVER
> bool "kexec handover"
> depends on ARCH_SUPPORTS_KEXEC_HANDOVER && ARCH_SUPPORTS_KEXEC_FILE
> depends on !DEFERRED_STRUCT_PAGE_INIT
> - select MEMBLOCK_KHO_SCRATCH
> select KEXEC_FILE
> select LIBFDT
> select CMA
> --
> 2.52.0
It appears that the above memblock tree commit has been removed from
the memblock tree, so this resolution is not longer needed.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2025-12-04 23:00 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-01 1:37 linux-next: manual merge of the memblock tree with the mm-nonmm-stable tree Stephen Rothwell
2025-12-04 23:00 ` Stephen Rothwell [this message]
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=20251205100007.734b0089@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=pasha.tatashin@soleen$(echo .)com \
--cc=rppt@kernel$(echo .)org \
--cc=usamaarif642@gmail$(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