From: Nicolas Ferre <nicolas.ferre@microchip.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Nicolas Ferre <nicolas.ferre@atmel.com>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
Ludovic Desroches <ludovic.desroches@microchip.com>
Cc: Claudiu Beznea <claudiu.beznea@microchip.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the at91 tree with Linus' tree
Date: Fri, 22 Oct 2021 11:38:41 +0200 [thread overview]
Message-ID: <0235edf0-9b33-9a88-3793-9062e59b8711@microchip.com> (raw)
In-Reply-To: <20211022085641.57d666a4@canb.auug.org.au>
On 21/10/2021 at 23:56, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the at91 tree got a conflict in:
>
> arch/arm/boot/dts/sama7g5.dtsi
>
> between commit:
>
> 6f3466228451 ("ARM: dts: at91: sama7g5: add chipid")
>
> from Linus' tree and commit:
>
> 9430ff34385e ("ARM: dts: at91: sama7g5: add tcb nodes")
>
> from the at91 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.
Stephen,
Yes, carry this fix please.
It's handled in arm-soc tree by Arnd and Olof: should not be a problem
upstream.
Thanks, best regards,
Nicolas
--
Nicolas Ferre
prev parent reply other threads:[~2021-10-22 9:38 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-21 21:56 Stephen Rothwell
2021-10-22 9:38 ` Nicolas Ferre [this message]
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=0235edf0-9b33-9a88-3793-9062e59b8711@microchip.com \
--to=nicolas.ferre@microchip.com \
--cc=alexandre.belloni@bootlin.com \
--cc=claudiu.beznea@microchip.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ludovic.desroches@microchip.com \
--cc=nicolas.ferre@atmel.com \
--cc=sfr@canb.auug.org.au \
/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®