From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752715AbbCKVxY (ORCPT <rfc822;w@1wt.eu>);
	Wed, 11 Mar 2015 17:53:24 -0400
Received: from mout.kundenserver.de ([212.227.17.13]:50604 "EHLO
	mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751426AbbCKVxV (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Wed, 11 Mar 2015 17:53:21 -0400
From: Arnd Bergmann <arnd@arndb.de>
To: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Olof Johansson <olof@lixom.net>, arm@kernel.org,
        Linux Kernel list <linux-kernel@vger.kernel.org>,
        linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
        Alexandre Belloni <alexandre.belloni@free-electrons.com>,
        Boris BREZILLON <boris.brezillon@free-electrons.com>,
        Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>,
        Ludovic Desroches <ludovic.desroches@atmel.com>
Subject: Re: [GIT PULL] at91: dt for 4.1 #1
Date: Wed, 11 Mar 2015 22:50:41 +0100
Message-ID: <4131070.FCHplsfiAq@wuerfel>
User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; )
In-Reply-To: <1425744721-27138-1-git-send-email-nicolas.ferre@atmel.com>
References: <1425744721-27138-1-git-send-email-nicolas.ferre@atmel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
X-Provags-ID: V03:K0:pUiosKrDC9plOqItyMHQ6IkzvL/X3iGKxzDaA5Zn0tfiLvS2y+a
 pL463dPVQ2RAzNKrG2jnsu5IipfcYOZiNjM2dSNTDoYFyf6Pobu/hqW7R2856aoajZ7opPU
 Y0gMrzxwJdKrz2IQoCIISd2aZsHKCrIhUWLdrWnp40NzI/uPcGV5OeFg66imzEgpOFjQOMW
 5kas99a+Sq/kDY6TLhFBA==
X-UI-Out-Filterresults: notjunk:1;
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Saturday 07 March 2015 17:12:01 Nicolas Ferre wrote:
> Arnd, Olof, Kevin,
> 
> This is a first batch of DT updates for 4.1. You'll find many little nodes
> added to several chips and boards. The bulk of it is related to sama5d4 though.
> Sama5d4 Xplained board is also added during this cycle.

Pulled into next/dt.
 
> Please note that this tag is stacked on top of my first at91-fixes pull-request
> that you already took. This is due to a conflict that shows up in the aliases
> section of sama5d4.dtsi.
> I did this to avoid having to deal with this conflict for the whole cycle. If
> you want me to do someting else, please tell me.

No, this is exactly the right way to deal with the conflict, thanks!

	Arnd