From: James Hogan <james.hogan@imgtec.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: <linux-next@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Vineet Gupta <vgupta@synopsys.com>
Subject: Re: linux-next: manual merge of the metag tree with the arc tree
Date: Wed, 6 Feb 2013 13:01:37 +0000 [thread overview]
Message-ID: <51125431.2090300@imgtec.com> (raw)
In-Reply-To: <20130206110346.edff1db373e5badee7df04c4@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 486 bytes --]
On 06/02/13 00:03, Stephen Rothwell wrote:
> Hi James,
>
> Today's linux-next merge of the metag tree got a conflict in
> tools/perf/perf.h between commit 12bf48ef6194 ("perf, ARC: Enable
> building perf tools for ARC") from the arc tree and commit 6c4a2bebec36
> ("perf: Enable building perf tools for Meta") from the metag tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
Thanks, looks good to me
Cheers
James
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
prev parent reply other threads:[~2013-02-06 13:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-06 0:03 linux-next: manual merge of the metag tree with the arc tree Stephen Rothwell
2013-02-06 13:01 ` James Hogan [this message]
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=51125431.2090300@imgtec.com \
--to=james.hogan@imgtec.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=vgupta@synopsys.com \
/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