mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Neil Armstrong <neil.armstrong@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	Thomas Gleixner <tglx@linutronix.de>,
	Ingo Molnar <mingo@kernel.org>, "H. Peter Anvin" <hpa@zytor.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Kevin Hilman <khilman@baylibre.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Xianwei Zhao <xianwei.zhao@amlogic.com>
Subject: Re: linux-next: manual merge of the tip tree with the amlogic tree
Date: Thu, 20 Nov 2025 08:46:12 +0100	[thread overview]
Message-ID: <dc507069-6116-472a-a543-7951b8a177a4@linaro.org> (raw)
In-Reply-To: <20251120150418.591b5da9@canb.auug.org.au>

Hi,

On 11/20/25 05:04, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tip tree got a conflict in:
> 
>    arch/arm64/boot/dts/amlogic/amlogic-s6.dtsi
> 
> between commit:
> 
>    fe85b8876768 ("arm64: dts: amlogic: s6: add ao secure node")
> 
> from the amlogic tree and commit:
> 
>    4b6111d677c7 ("arm64: dts: amlogic: Add gpio_intc node for Amlogic S6 SoCs")

Thanks, I wasn't aware those DT patches were merged via another tree.

I'll remove my patches for now.

Neil

> 
> from the tip 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.
> 


  reply	other threads:[~2025-11-20  7:46 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-11-20  4:04 Stephen Rothwell
2025-11-20  7:46 ` Neil Armstrong [this message]
2025-11-20  4:06 Stephen Rothwell
2025-11-20  4:08 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=dc507069-6116-472a-a543-7951b8a177a4@linaro.org \
    --to=neil.armstrong@linaro.org \
    --cc=hpa@zytor.com \
    --cc=khilman@baylibre.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.org \
    --cc=sfr@canb.auug.org.au \
    --cc=tglx@linutronix.de \
    --cc=xianwei.zhao@amlogic.com \
    /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 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®