Subject: Re: linux-next: manual merge of the omap tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 5 Nov 2025 14:39:49 +1100

Hi Kevin,

On Tue, 04 Nov 2025 17:28:28 -0800 Kevin Hilman <[email-masked]> wrote:
>
> Stephen Rothwell <[email-masked]> writes:
> 
> > Today's linux-next merge of the omap tree got a conflict in:
> >
> >   arch/arm/configs/omap2plus_defconfig
> >
> > between commit:
> >
> >   c065b6046b34 ("Use CONFIG_EXT4_FS instead of CONFIG_EXT3_FS in all of the defconfigs")
> >
> > from Linus' tree and commit:
> >
> >   810c5ef6efe9 ("arm: omap2plus_defconfig: enable ext4 directly")
> >
> > from the omap tree.
> 
> Thanks for catching this.  I'll drop the patch from the omap tree.

The omap tree patch has more i.e. adds another CONFIG line.

-- 
Cheers,
Stephen Rothwell