Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751395AbbGaHKY (ORCPT ); Fri, 31 Jul 2015 03:10:24 -0400 Received: from eusmtp01.atmel.com ([212.144.249.242]:53633 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750804AbbGaHKX (ORCPT ); Fri, 31 Jul 2015 03:10:23 -0400 Message-ID: <55BB1F1C.6000501@atmel.com> Date: Fri, 31 Jul 2015 09:09:16 +0200 From: Nicolas Ferre Organization: atmel User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.8.0 MIME-Version: 1.0 To: Stephen Rothwell , Olof Johansson , Arnd Bergmann , CC: , , "Nicolas Pitre" Subject: Re: linux-next: manual merge of the at91 tree with the arm-soc tree References: <20150731083803.71c9d466@canb.auug.org.au> In-Reply-To: <20150731083803.71c9d466@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 Content-Length: 799 Lines: 30 Le 31/07/2015 00:38, Stephen Rothwell a ?crit : > Hi Nicolas, > > Today's linux-next merge of the at91 tree got a conflict in: > > arch/arm/mach-at91/sama5.c > > between commit: > > 19c233b79d1a ("ARM: appropriate __init annotation for const data") > > from the arm-soc tree and commit: > > a6e41317b9b8 ("ARM: at91/soc: add basic support for new sama5d2 SoC") > > from the at91 tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). The merge is correct. Thanks Stephen! 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/