All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kevin Hilman <khilman@baylibre.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
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: Tue, 04 Nov 2025 17:28:28 -0800	[thread overview]
Message-ID: <7ha511i7yb.fsf@baylibre.com> (raw)
In-Reply-To: <20251105115402.1b03f921@canb.auug.org.au>

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Hi all,
>
> 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.
>
> I fixed it up (the latter includes the former) 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.

Thanks for catching this.  I'll drop the patch from the omap tree.

Kevin

  reply	other threads:[~2025-11-05  1:28 UTC|newest]

Thread overview: 12+ 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 [this message]
2025-11-05  3:39   ` Stephen Rothwell
  -- 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  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  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=7ha511i7yb.fsf@baylibre.com \
    --to=khilman@baylibre.com \
    --cc=andreas@kemnade.info \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=tytso@mit.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.