Messages in this thread |  | | Date | Wed, 3 Dec 2025 11:31:04 +1100 | | From | Stephen Rothwell <> | | Subject | Re: linux-next: manual merge of the tip tree with the arm64 tree |
| |
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 [unhandled content-type:application/pgp-signature] |  |