From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Artem Bityutskiy <dedekind1@gmail•com>
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: linux-next: manual merge of the l2-mtd tree with the at91 tree
Date: Fri, 9 Sep 2011 13:29:20 +1000 [thread overview]
Message-ID: <20110909132920.3696fbb6c1b90cded9727d30@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 500 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2011-09-09 3:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-09 3:29 Stephen Rothwell [this message]
2011-09-09 6:45 ` linux-next: manual merge of the l2-mtd tree with the at91 tree Artem Bityutskiy
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=20110909132920.3696fbb6c1b90cded9727d30@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dbaryshkov@gmail$(echo .)com \
--cc=dedekind1@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ne@erfurth$(echo .)eu \
--cc=nicolas.ferre@atmel$(echo .)com \
--cc=plagnioj@jcrosoft$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox