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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20251105143949.379e529a@canb.auug.org.au>
Date: Wed, 5 Nov 2025 14:39:49 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Kevin Hilman <khilman@...libre.com>
Cc: Andreas Kemnade <andreas@...nade.info>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Theodore Ts'o <tytso@....edu>
Subject: Re: linux-next: manual merge of the omap tree with Linus' tree

Hi Kevin,

On Tue, 04 Nov 2025 17:28:28 -0800 Kevin Hilman <khilman@...libre.com> wrote:
>
> Stephen Rothwell <sfr@...b.auug.org.au> 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

Content of type "application/pgp-signature" skipped