From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the mvebu tree with the arm tree
Date: Mon, 7 Jul 2014 09:22:36 +0100 [thread overview]
Message-ID: <20140707082236.GX21766@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <20140707112853.7f5a9323@canb.auug.org.au>
On Mon, Jul 07, 2014 at 11:28:53AM +1000, Stephen Rothwell wrote:
> diff --cc arch/arm/mach-mvebu/headsmp-a9.S
> index 7c91ddb6f1f7,da5bb292b91c..000000000000
> --- a/arch/arm/mach-mvebu/headsmp-a9.S
> +++ b/arch/arm/mach-mvebu/headsmp-a9.S
> @@@ -14,8 -14,9 +14,10 @@@
>
> #include <linux/linkage.h>
> #include <linux/init.h>
> +#include <asm/assembler.h>
>
> + #include <asm/assembler.h>
> +
Obviously not quite correct - this looks like an automatic merge, something
that will have to be kept an eye on during the proper merge window.
--
FTTC broadband for 0.8mile line: now at 9.7Mbps down 460kbps up... slowly
improving, and getting towards what was expected from it.
next prev parent reply other threads:[~2014-07-07 8:22 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-07 1:28 linux-next: manual merge of the mvebu tree with the arm tree Stephen Rothwell
2014-07-07 8:22 ` Russell King - ARM Linux [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-07-17 1:39 Stephen Rothwell
2014-04-28 1:33 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=20140707082236.GX21766@n2100.arm.linux.org.uk \
--to=linux@arm.linux.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
/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).