From: Nicolas Ferre <nicolas.ferre@atmel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Linus Walleij <linus.walleij@linaro.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Ludovic Desroches <ludovic.desroches@atmel.com>,
Alexandre Belloni <alexandre.belloni@free-electrons.com>,
Cyrille Pitchen <cyrille.pitchen@atmel.com>
Subject: Re: linux-next: manual merge of the pinctrl tree with the at91 tree
Date: Mon, 2 Nov 2015 10:06:54 +0100 [thread overview]
Message-ID: <563727AE.5060408@atmel.com> (raw)
In-Reply-To: <20151102011619.0ff847db@canb.auug.org.au>
Le 01/11/2015 15:16, Stephen Rothwell a écrit :
> Hi Linus,
>
> Today's linux-next merge of the pinctrl tree got a conflict in:
>
> arch/arm/boot/dts/sama5d2.dtsi
>
> between commit:
>
> 512fc048e4fd ("ARM: at91/dt: sama5d2: add missing devices")
>
> from the at91 tree and commit:
>
> f6c804b08ca5 ("ARM: at91/dt: sama5d2: add pio controller node")
>
> from the pinctrl tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Hi Stephen,
The fix is good: thanks. (We tend to sort DT nodes by address which
would have given the pinctrl node before the tdes one but that not a big
deal: we still can correct this later with a trivial patch).
Bye,
--
Nicolas Ferre
prev parent reply other threads:[~2015-11-02 9:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-01 14:16 linux-next: manual merge of the pinctrl tree with the at91 tree Stephen Rothwell
2015-11-02 9:06 ` 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=563727AE.5060408@atmel.com \
--to=nicolas.ferre@atmel.com \
--cc=alexandre.belloni@free-electrons.com \
--cc=cyrille.pitchen@atmel.com \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ludovic.desroches@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;
as well as URLs for NNTP newsgroup(s).