From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Kevin Hilman <khilman@baylibre•com>
Cc: Andreas Kemnade <andreas@kemnade•info>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Theodore Ts'o <tytso@mit•edu>
Subject: Re: linux-next: manual merge of the omap tree with Linus' tree
Date: Wed, 5 Nov 2025 14:39:49 +1100 [thread overview]
Message-ID: <20251105143949.379e529a@canb.auug.org.au> (raw)
In-Reply-To: <7ha511i7yb.fsf@baylibre.com>
[-- Attachment #1: Type: text/plain, Size: 706 bytes --]
Hi Kevin,
On Tue, 04 Nov 2025 17:28:28 -0800 Kevin Hilman <khilman@baylibre•com> wrote:
>
> Stephen Rothwell <sfr@canb•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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2025-11-05 3:39 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-05 0:54 linux-next: manual merge of the omap tree with Linus' tree Stephen Rothwell
2025-11-05 1:28 ` Kevin Hilman
2025-11-05 3:39 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-09-17 11:52 Mark Brown
2009-10-30 0:46 Stephen Rothwell
2009-10-30 14:46 ` Tony Lindgren
2009-10-31 4:31 ` Stephen Rothwell
2009-10-30 0:46 Stephen Rothwell
2009-10-30 14:45 ` Tony Lindgren
2009-10-31 4:30 ` Stephen Rothwell
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=20251105143949.379e529a@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=andreas@kemnade$(echo .)info \
--cc=khilman@baylibre$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tytso@mit$(echo .)edu \
/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