From mboxrd@z Thu Jan 1 00:00:00 1970 From: Artem Bityutskiy Subject: Re: linux-next: manual merge of the l2-mtd tree with the at91 tree Date: Fri, 09 Sep 2011 09:45:28 +0300 Message-ID: <1315550734.7905.14.camel@sauron> References: <20110909132920.3696fbb6c1b90cded9727d30@canb.auug.org.au> Reply-To: dedekind1@gmail.com Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-gx0-f174.google.com ([209.85.161.174]:60549 "EHLO mail-gx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753695Ab1IIGnI (ORCPT ); Fri, 9 Sep 2011 02:43:08 -0400 In-Reply-To: <20110909132920.3696fbb6c1b90cded9727d30@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Dmitry Eremin-Solenikov , Nico Erfurth , Jean-Christophe PLAGNIOL-VILLARD , Nicolas Ferre On Fri, 2011-09-09 at 13:29 +1000, Stephen Rothwell wrote: > Hi Artem, > > Today's linux-next merge of the l2-mtd tree got a conflict in > arch/arm/mach-at91/board-usb-a9260.c between commit 6939fd49787e ("at91: > merge board USB-A9260 and USB-A9263 together") from the at91 tree and > commit 29921652b159 ("mtd: ATMEL, AVR32: inline nand partition table > access") from the l2-mtd tree. > > The former removed the file modified by the latter, so I did that. OK, thanks, I guess you'll carry this modification so far, we'll need to take care of the conflict when merging. -- Best Regards, Artem Bityutskiy