* linux-next: manual merge of the mm tree with the origin tree
@ 2026-10-21 13:06 Mark Brown
2026-10-21 14:44 ` Magnus Lindholm
0 siblings, 1 reply; 3+ messages in thread
From: Mark Brown @ 2026-10-21 13:06 UTC (permalink / raw)
To: David Hildenbrand, Mike Rapoport, Vlastimil Babka, Andrew Morton
Cc: Linux Kernel Mailing List, Linux Next Mailing List,
Lorenzo Stoakes, Magnus Lindholm, Matt Turner
[-- Attachment #1: Type: text/plain, Size: 1189 bytes --]
Hi all,
Today's linux-next merge of the mm tree got a conflict in:
arch/alpha/Kconfig
between commit:
0d4c9dd06c364 ("alpha: select SPARSE_IRQ")
from the origin tree and commit:
35e340a47888e ("mm: userland pgtable freeing is RCU-safe now, remove leftover bits")
from the mm 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 arch/alpha/Kconfig
index 8fafbfabd1e51,9063c7bda4e41..0000000000000
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@@ -71,10 -42,7 +71,9 @@@ config ALPH
select ARCH_STACKWALK
select CPU_NO_EFFICIENT_FFS if !ALPHA_EV67
select MMU_GATHER_NO_RANGE
- select MMU_GATHER_RCU_TABLE_FREE
+ select SPARSE_IRQ
select SPARSEMEM_EXTREME if SPARSEMEM
+ select SYSCTL_EXCEPTION_TRACE
select ZONE_DMA
select TRACE_IRQFLAGS_SUPPORT
select ARCH_WANT_FRAME_POINTERS
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the mm tree with the origin tree
2026-10-21 13:06 linux-next: manual merge of the mm tree with the origin tree Mark Brown
@ 2026-10-21 14:44 ` Magnus Lindholm
2026-10-21 14:51 ` Lorenzo Stoakes (ARM)
0 siblings, 1 reply; 3+ messages in thread
From: Magnus Lindholm @ 2026-10-21 14:44 UTC (permalink / raw)
To: Mark Brown
Cc: David Hildenbrand, Mike Rapoport, Vlastimil Babka, Andrew Morton,
Linux Kernel Mailing List, Linux Next Mailing List,
Lorenzo Stoakes, Matt Turner
Hi Mark,
On Wed, Oct 21, 2026 at 3:42 PM Mark Brown <broonie@kernel.org> wrote:
>
> Hi all,
>
> Today's linux-next merge of the mm tree got a conflict in:
>
> arch/alpha/Kconfig
>
> between commit:
>
> 0d4c9dd06c364 ("alpha: select SPARSE_IRQ")
>
> from the origin tree and commit:
>
> 35e340a47888e ("mm: userland pgtable freeing is RCU-safe now, remove leftover bits")
>
> from the mm 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 arch/alpha/Kconfig
> index 8fafbfabd1e51,9063c7bda4e41..0000000000000
> --- a/arch/alpha/Kconfig
> +++ b/arch/alpha/Kconfig
> @@@ -71,10 -42,7 +71,9 @@@ config ALPH
> select ARCH_STACKWALK
> select CPU_NO_EFFICIENT_FFS if !ALPHA_EV67
> select MMU_GATHER_NO_RANGE
> - select MMU_GATHER_RCU_TABLE_FREE
> + select SPARSE_IRQ
> select SPARSEMEM_EXTREME if SPARSEMEM
> + select SYSCTL_EXCEPTION_TRACE
> select ZONE_DMA
> select TRACE_IRQFLAGS_SUPPORT
> select ARCH_WANT_FRAME_POINTERS
The resolution looks correct to me. Thanks for resolving this.
Regards,
Magnus
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the mm tree with the origin tree
2026-10-21 14:44 ` Magnus Lindholm
@ 2026-10-21 14:51 ` Lorenzo Stoakes (ARM)
0 siblings, 0 replies; 3+ messages in thread
From: Lorenzo Stoakes (ARM) @ 2026-10-21 14:51 UTC (permalink / raw)
To: Magnus Lindholm
Cc: Mark Brown, David Hildenbrand, Mike Rapoport, Vlastimil Babka,
Andrew Morton, Linux Kernel Mailing List,
Linux Next Mailing List, Matt Turner
On Wed, Oct 21, 2026 at 04:44:36PM +0200, Magnus Lindholm wrote:
> Hi Mark,
>
> On Wed, Oct 21, 2026 at 3:42 PM Mark Brown <broonie@kernel.org> wrote:
> >
> > Hi all,
> >
> > Today's linux-next merge of the mm tree got a conflict in:
> >
> > arch/alpha/Kconfig
> >
> > between commit:
> >
> > 0d4c9dd06c364 ("alpha: select SPARSE_IRQ")
> >
> > from the origin tree and commit:
> >
> > 35e340a47888e ("mm: userland pgtable freeing is RCU-safe now, remove leftover bits")
> >
> > from the mm 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 arch/alpha/Kconfig
> > index 8fafbfabd1e51,9063c7bda4e41..0000000000000
> > --- a/arch/alpha/Kconfig
> > +++ b/arch/alpha/Kconfig
> > @@@ -71,10 -42,7 +71,9 @@@ config ALPH
> > select ARCH_STACKWALK
> > select CPU_NO_EFFICIENT_FFS if !ALPHA_EV67
> > select MMU_GATHER_NO_RANGE
> > - select MMU_GATHER_RCU_TABLE_FREE
> > + select SPARSE_IRQ
> > select SPARSEMEM_EXTREME if SPARSEMEM
> > + select SYSCTL_EXCEPTION_TRACE
> > select ZONE_DMA
> > select TRACE_IRQFLAGS_SUPPORT
> > select ARCH_WANT_FRAME_POINTERS
>
> The resolution looks correct to me. Thanks for resolving this.
Ack agreed, thanks!
>
> Regards,
>
> Magnus
--
Cheers, Lorenzo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-10-21 14:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-10-21 13:06 linux-next: manual merge of the mm tree with the origin tree Mark Brown
2026-10-21 14:44 ` Magnus Lindholm
2026-10-21 14:51 ` Lorenzo Stoakes (ARM)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®