linux-kernel - Re: linux-next: manual merge of the pinctrl tree with the at91 tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <563727AE.5060408@atmel.com>
Date:	Mon, 2 Nov 2015 10:06:54 +0100
From:	Nicolas Ferre <nicolas.ferre@...el.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Linus Walleij <linus.walleij@...aro.org>
CC:	<linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
	"Ludovic Desroches" <ludovic.desroches@...el.com>,
	Alexandre Belloni <alexandre.belloni@...e-electrons.com>,
	Cyrille Pitchen <cyrille.pitchen@...el.com>
Subject: Re: linux-next: manual merge of the pinctrl tree with the at91 tree

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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/