From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>,
Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Russell King <rmk@arm.linux.org.uk>
Subject: linux-next: manual merge of the at91 tree with the arm tree
Date: Fri, 9 Sep 2011 11:20:42 +1000 [thread overview]
Message-ID: <20110909112042.0949282e1e38b8c68bb00b9b@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 513 bytes --]
Hi all,
Today's linux-next merge of the at91 tree got a conflict in
arch/arm/mach-at91/board-usb-a9260.c between commit 2f8163baada3 ("ARM:
gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h")
from the arm tree and commit 6939fd49787e ("at91: merge board USB-A9260
and USB-A9263 together") from the at91 tree.
The latter removes the file modified by the former, so I did thet.
--
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 1:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-09 1:20 Stephen Rothwell [this message]
2011-11-22 1:19 linux-next: manual merge of the at91 tree with the arm tree Stephen Rothwell
2011-11-22 1:22 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=20110909112042.0949282e1e38b8c68bb00b9b@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nicolas.ferre@atmel.com \
--cc=plagnioj@jcrosoft.com \
--cc=rmk@arm.linux.org.uk \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).