From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicolas Ferre Subject: Re: linux-next: manual merge of the pinctrl tree with the at91 tree Date: Mon, 2 Nov 2015 10:06:54 +0100 Message-ID: <563727AE.5060408@atmel.com> References: <20151102011619.0ff847db@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from eusmtp01.atmel.com ([212.144.249.243]:10276 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751677AbbKBJGs (ORCPT ); Mon, 2 Nov 2015 04:06:48 -0500 In-Reply-To: <20151102011619.0ff847db@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell , Linus Walleij Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Ludovic Desroches , Alexandre Belloni , Cyrille Pitchen Le 01/11/2015 15:16, Stephen Rothwell a =E9crit : > Hi Linus, >=20 > Today's linux-next merge of the pinctrl tree got a conflict in: >=20 > arch/arm/boot/dts/sama5d2.dtsi >=20 > between commit: >=20 > 512fc048e4fd ("ARM: at91/dt: sama5d2: add missing devices") >=20 > from the at91 tree and commit: >=20 > f6c804b08ca5 ("ARM: at91/dt: sama5d2: add pio controller node") >=20 > from the pinctrl tree. >=20 > I fixed it up (see below) and can carry the fix as necessary (no acti= on > 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 bi= g deal: we still can correct this later with a trivial patch). Bye, --=20 Nicolas Ferre From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753419AbbKBJGv (ORCPT ); Mon, 2 Nov 2015 04:06:51 -0500 Received: from eusmtp01.atmel.com ([212.144.249.243]:10276 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751677AbbKBJGs (ORCPT ); Mon, 2 Nov 2015 04:06:48 -0500 Subject: Re: linux-next: manual merge of the pinctrl tree with the at91 tree To: Stephen Rothwell , Linus Walleij References: <20151102011619.0ff847db@canb.auug.org.au> CC: , , "Ludovic Desroches" , Alexandre Belloni , Cyrille Pitchen From: Nicolas Ferre 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 X-Originating-IP: [10.161.30.18] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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