From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Russell King <rmk@arm.linux.org.uk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jeremy Kerr <jeremy.kerr@canonical.com>
Subject: linux-next: manual merge of the arm tree with the arm-current tree
Date: Mon, 26 Jul 2010 11:13:40 +1000 [thread overview]
Message-ID: <20100726111340.a0bb25c1.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 556 bytes --]
Hi Russell,
Today's linux-next merge of the arm tree got a conflict in
arch/arm/mach-l7200/include/mach/debug-macro.S between commit
a2d7c57a2eb1d30a7fdb8df9e965dea721b75711 ("ARM: 6257/1: arm/l7200: fix
debug macro compilation failure") from the arm-current tree and commit
c9c6fe5033191d82e1d819105485c795062107fd ("ARM: Remove support for LinkUp
Systems L7200 SDP") from the arm tree.
The latter just removes the file, 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:[~2010-07-26 1:13 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-26 1:13 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-12-14 23:54 linux-next: manual merge of the arm tree with the arm-current tree Stephen Rothwell
2010-12-14 23:57 ` Russell King
2010-12-15 12:28 ` Dave Martin
2010-12-15 16:43 ` Russell King
2010-12-05 23:58 Stephen Rothwell
2010-10-11 23:33 Stephen Rothwell
2010-10-12 8:03 ` Uwe Kleine-König
2010-10-12 8:28 ` Russell King
2010-10-12 9:23 ` Uwe Kleine-König
2010-10-12 9:42 ` Russell King
2010-10-12 10:02 ` Uwe Kleine-König
2010-10-12 10:35 ` Sascha Hauer
2010-10-11 1:24 Stephen Rothwell
2010-10-11 7:48 ` Anders Larsen
2010-09-27 4:21 Stephen Rothwell
2010-02-02 0:07 Stephen Rothwell
2010-01-17 23:35 Stephen Rothwell
2010-01-18 1:33 ` Ben Dooks
2010-01-18 3:34 ` Stephen Rothwell
2009-05-06 1:32 Stephen Rothwell
2009-03-23 0:06 Stephen Rothwell
2009-02-15 23:39 Stephen Rothwell
2009-02-16 0:18 ` Ryan Mallon
2009-02-16 0:29 ` Russell King
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=20100726111340.a0bb25c1.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=jeremy.kerr@canonical.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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).