Subject: Re: linux-next: manual merge of the pinctrl tree with the at91 tree
To: Stephen Rothwell <sfr@canb.auug.org.au>,
        Linus Walleij <linus.walleij@linaro.org>
References: <20151102011619.0ff847db@canb.auug.org.au>
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>
From: Nicolas Ferre <nicolas.ferre@atmel.com>
Organization: atmel
Message-ID: <563727AE.5060408@atmel.com>
Date: Mon, 2 Nov 2015 10:06:54 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101
 Thunderbird/38.3.0
MIME-Version: 1.0
In-Reply-To: <20151102011619.0ff847db@canb.auug.org.au>
Content-Type: text/plain; charset="windows-1252"
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 968
Lines: 34

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/