From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>
Cc: Heiko Carstens <hca@linux•ibm.com>,
Vasily Gorbik <gor@linux•ibm.com>,
Christian Borntraeger <borntraeger@de•ibm.com>,
Israel Batista <linux@israelbatista•dev.br>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Sumanth Korikkar <sumanthk@linux•ibm.com>
Subject: Re: linux-next: manual merge of the s390 tree with the mm-unstable tree
Date: Thu, 4 Dec 2025 13:06:32 +1100 [thread overview]
Message-ID: <20251204130632.379edc9b@canb.auug.org.au> (raw)
In-Reply-To: <20251103100750.4522060e@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2874 bytes --]
Hi all,
On Mon, 3 Nov 2025 10:07:50 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the s390 tree got a conflict in:
>
> include/linux/memory.h
>
> between commit:
>
> 074be77d684a ("mm: convert memory block states (MEM_*) macros to enum")
>
> from the mm-unstable tree and commit:
>
> 300709fbefd1 ("mm/memory_hotplug: Remove MEM_PREPARE_ONLINE/MEM_FINISH_OFFLINE notifiers")
>
> from the s390 tree.
>
> I fixed it up (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.
>
>
> diff --cc include/linux/memory.h
> index ca3eb1db6cc8,ba1515160894..000000000000
> --- a/include/linux/memory.h
> +++ b/include/linux/memory.h
> @@@ -64,21 -64,9 +64,19 @@@ struct memory_group
> };
> };
>
> +enum memory_block_state {
> + /* These states are exposed to userspace as text strings in sysfs */
> + MEM_ONLINE, /* exposed to userspace */
> + MEM_GOING_OFFLINE, /* exposed to userspace */
> + MEM_OFFLINE, /* exposed to userspace */
> + MEM_GOING_ONLINE,
> + MEM_CANCEL_ONLINE,
> + MEM_CANCEL_OFFLINE,
> - MEM_PREPARE_ONLINE,
> - MEM_FINISH_OFFLINE,
> +};
> +
> struct memory_block {
> unsigned long start_section_nr;
> - unsigned long state; /* serialized by the dev->lock */
> + enum memory_block_state state; /* serialized by the dev->lock */
> int online_type; /* for passing data to online routine */
> int nid; /* NID for this memory block */
> /*
> @@@ -101,14 -89,15 +99,7 @@@ int arch_get_memory_phys_device(unsigne
> unsigned long memory_block_size_bytes(void);
> int set_memory_block_size_order(unsigned int order);
>
> -/* These states are exposed to userspace as text strings in sysfs */
> -#define MEM_ONLINE (1<<0) /* exposed to userspace */
> -#define MEM_GOING_OFFLINE (1<<1) /* exposed to userspace */
> -#define MEM_OFFLINE (1<<2) /* exposed to userspace */
> -#define MEM_GOING_ONLINE (1<<3)
> -#define MEM_CANCEL_ONLINE (1<<4)
> -#define MEM_CANCEL_OFFLINE (1<<5)
> -
> struct memory_notify {
> - /*
> - * The altmap_start_pfn and altmap_nr_pages fields are designated for
> - * specifying the altmap range and are exclusively intended for use in
> - * MEM_PREPARE_ONLINE/MEM_FINISH_OFFLINE notifiers.
> - */
> - unsigned long altmap_start_pfn;
> - unsigned long altmap_nr_pages;
> unsigned long start_pfn;
> unsigned long nr_pages;
> };
This is now a conflict between the mm-stable tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2025-12-04 2:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-02 23:07 linux-next: manual merge of the s390 tree with the mm-unstable tree Stephen Rothwell
2025-12-04 2:06 ` 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=20251204130632.379edc9b@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=borntraeger@de$(echo .)ibm.com \
--cc=gor@linux$(echo .)ibm.com \
--cc=hca@linux$(echo .)ibm.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@israelbatista$(echo .)dev.br \
--cc=sumanthk@linux$(echo .)ibm.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