From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Catalin Marinas <catalin.marinas@arm•com>, Will Deacon <will@kernel•org>
Cc: Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@kernel•org>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Ard Biesheuvel <ardb@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the tip tree with the arm64 tree
Date: Wed, 3 Dec 2025 11:31:04 +1100 [thread overview]
Message-ID: <20251203113104.38f2267b@canb.auug.org.au> (raw)
In-Reply-To: <20251121130736.465b826d@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 3081 bytes --]
Hi all,
On Fri, 21 Nov 2025 13:07:36 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> After merging the tip tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/firmware/efi/efi.c:78:10: error: 'struct mm_struct' has no member named 'cpus_allowed_lock'
> 78 | .cpus_allowed_lock = __RAW_SPIN_LOCK_UNLOCKED(efi_mm.cpus_allowed_lock),
> | ^~~~~~~~~~~~~~~~~
> In file included from include/linux/spinlock_types.h:12,
> from include/linux/mutex.h:16,
> from include/linux/kernfs.h:11,
> from include/linux/sysfs.h:16,
> from include/linux/kobject.h:20,
> from drivers/firmware/efi/efi.c:17:
> include/linux/spinlock_types_raw.h:69:9: warning: excess elements in struct initializer
> 69 | (raw_spinlock_t) __RAW_SPIN_LOCK_INITIALIZER(lockname)
> | ^
> drivers/firmware/efi/efi.c:78:35: note: in expansion of macro '__RAW_SPIN_LOCK_UNLOCKED'
> 78 | .cpus_allowed_lock = __RAW_SPIN_LOCK_UNLOCKED(efi_mm.cpus_allowed_lock),
> | ^~~~~~~~~~~~~~~~~~~~~~~~
> include/linux/spinlock_types_raw.h:69:9: note: (near initialization for 'efi_mm')
> 69 | (raw_spinlock_t) __RAW_SPIN_LOCK_INITIALIZER(lockname)
> | ^
> drivers/firmware/efi/efi.c:78:35: note: in expansion of macro '__RAW_SPIN_LOCK_UNLOCKED'
> 78 | .cpus_allowed_lock = __RAW_SPIN_LOCK_UNLOCKED(efi_mm.cpus_allowed_lock),
> | ^~~~~~~~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
> 8cea569ca785 ("sched/mmcid: Use proper data structures")
>
> interatcing with commit
>
> 40374d308e4e ("efi: Add missing static initializer for efi_mm::cpus_allowed_lock")
>
> from the arm64 tree.
>
> I have applied the following merge resolution patch.
>
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Fri, 21 Nov 2025 12:57:10 +1100
> Subject: [PATCH] fix up for "sched/mmcid: Use proper data structures"
>
> interacting with commit
>
> 40374d308e4e ("efi: Add missing static initializer for efi_mm::cpus_allowed_lock")
>
> from the arm64 tree.
>
> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> ---
> drivers/firmware/efi/efi.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
> index fc407d891348..a9070d00b833 100644
> --- a/drivers/firmware/efi/efi.c
> +++ b/drivers/firmware/efi/efi.c
> @@ -75,7 +75,7 @@ struct mm_struct efi_mm = {
> .mmlist = LIST_HEAD_INIT(efi_mm.mmlist),
> .cpu_bitmap = { [BITS_TO_LONGS(NR_CPUS)] = 0},
> #ifdef CONFIG_SCHED_MM_CID
> - .cpus_allowed_lock = __RAW_SPIN_LOCK_UNLOCKED(efi_mm.cpus_allowed_lock),
> + .mm_cid.lock = __RAW_SPIN_LOCK_UNLOCKED(efi_mm.mm_cid.lock),
> #endif
> };
>
> --
> 2.51.1
This is now a conflict between the arm64 tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2025-12-03 0:31 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-21 2:07 linux-next: manual merge of the tip tree with the arm64 tree Stephen Rothwell
2025-12-03 0:31 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-12-13 16:45 broonie
2021-08-27 4:09 Stephen Rothwell
2020-05-22 6:11 Stephen Rothwell
2020-03-18 4:27 Stephen Rothwell
2020-03-18 8:50 ` Catalin Marinas
2020-03-10 1:49 Stephen Rothwell
2019-04-15 4:25 Stephen Rothwell
2019-04-15 4:21 Stephen Rothwell
2017-11-01 5:47 Stephen Rothwell
2017-11-13 22:52 ` Stephen Rothwell
2017-08-22 3:38 Stephen Rothwell
2017-09-04 5:29 ` Stephen Rothwell
2017-06-16 3:25 Stephen Rothwell
2017-07-03 1:29 ` Stephen Rothwell
2017-03-31 3:02 Stephen Rothwell
2017-03-31 9:32 ` Arnd Bergmann
2017-03-31 11:24 ` Stephen Rothwell
2016-09-12 2:54 Stephen Rothwell
2016-05-12 2:00 Stephen Rothwell
2016-04-29 3:56 Stephen Rothwell
2016-04-29 9:04 ` Matt Fleming
2016-02-26 1:53 Stephen Rothwell
2016-02-26 1:53 Stephen Rothwell
2015-10-22 2:26 Stephen Rothwell
2015-10-22 12:06 ` Suzuki K. Poulose
2015-10-22 15:32 ` Catalin Marinas
2015-10-31 22:17 ` Stephen Rothwell
2015-10-15 3:05 Stephen Rothwell
2015-10-13 2:10 Stephen Rothwell
2015-10-13 9:50 ` Will Deacon
2014-05-23 6:44 Stephen Rothwell
2014-05-23 9:23 ` Catalin Marinas
2014-05-23 6:28 Stephen Rothwell
2014-05-23 8:41 ` Catalin Marinas
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=20251203113104.38f2267b@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ardb@kernel$(echo .)org \
--cc=catalin.marinas@arm$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@kernel$(echo .)org \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
--cc=will@kernel$(echo .)org \
/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