From: Artem Bityutskiy <dedekind1@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>,
Nico Erfurth <ne@erfurth.eu>,
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>,
Nicolas Ferre <nicolas.ferre@atmel.com>
Subject: Re: linux-next: manual merge of the l2-mtd tree with the at91 tree
Date: Fri, 09 Sep 2011 09:45:28 +0300 [thread overview]
Message-ID: <1315550734.7905.14.camel@sauron> (raw)
In-Reply-To: <20110909132920.3696fbb6c1b90cded9727d30@canb.auug.org.au>
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
next prev parent reply other threads:[~2011-09-09 6:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-09 3:29 linux-next: manual merge of the l2-mtd tree with the at91 tree Stephen Rothwell
2011-09-09 6:45 ` Artem Bityutskiy [this message]
2011-09-09 6:45 ` Stephen Rothwell
2011-09-09 9:53 ` Nicolas Ferre
2011-09-09 10:27 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2011-09-22 5:36 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1315550734.7905.14.camel@sauron \
--to=dedekind1@gmail.com \
--cc=dbaryshkov@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ne@erfurth.eu \
--cc=nicolas.ferre@atmel.com \
--cc=plagnioj@jcrosoft.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.