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 S1032936AbdDTOvF convert rfc822-to-8bit (ORCPT <rfc822;w@1wt.eu>);
        Thu, 20 Apr 2017 10:51:05 -0400
Received: from esa4.microchip.iphmx.com ([68.232.154.123]:61207 "EHLO
        esa4.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S946492AbdDTOvD (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Thu, 20 Apr 2017 10:51:03 -0400
X-IronPort-AV: E=Sophos;i="5.37,225,1488870000"; 
   d="scan'208";a="1734010"
From: <Nicolas.Ferre@microchip.com>
To: <sfr@canb.auug.org.au>, <nicolas.ferre@atmel.com>, <olof@lixom.net>,
        <arnd@arndb.de>, <linux-arm-kernel@lists.infradead.org>
CC: <linux-next@vger.kernel.org>, <alexandre.belloni@free-electrons.com>,
        <linux-kernel@vger.kernel.org>, <peda@axentia.se>
Subject: RE: linux-next: manual merge of the at91 tree with the arm-soc tree
Thread-Topic: linux-next: manual merge of the at91 tree with the arm-soc tree
Thread-Index: AQHSuV4CdBzSqMXDrEyFssYiBIbjB6HOV3Lq
Date: Thu, 20 Apr 2017 14:50:57 +0000
Message-ID: <56448E9475A7CD4F97A754616F76B45780C65F@CHN-SV-EXMX07.mchp-main.com>
References: <20170420083817.5a44b69c@canb.auug.org.au>
In-Reply-To: <20170420083817.5a44b69c@canb.auug.org.au>
Accept-Language: en-US
Content-Language: en-US
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
x-originating-ip: [10.10.215.90]
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 8BIT
MIME-Version: 1.0
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

> Hi Nicolas,
>
> Today's linux-next merge of the at91 tree got a conflict in:
> 
>  arch/arm/boot/dts/at91-tse850-3.dts
> between commit:
>
> e67cedc92812 ("ARM: dts: at91: add envelope detector mux to the Axentia TSE-850")
>
> from the arm-soc tree and commit:
>
>  29dd89418007 ("ARM: dts: at91: add envelope detector mux to the Axentia TSE-850")
>
> from the at91 tree.
>
> I fixed it up (I used the arm-soc tree version) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging.  You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.

Stephen,

Yes, the use of arm-soc version was the way to go. I now have updated my at91-next tree to match Alexandre's pull-request and hope it is not in conflict anymore.

Thanks for your fix.
Best regards,