From: Will Deacon <will.deacon@arm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Mark Rutland <Mark.Rutland@arm.com>
Subject: Re: linux-next: manual merge of the arm-perf tree with the tree
Date: Mon, 1 Jun 2015 10:52:24 +0100 [thread overview]
Message-ID: <20150601095223.GE1641@arm.com> (raw)
In-Reply-To: <20150601101253.2e454719@canb.auug.org.au>
On Mon, Jun 01, 2015 at 01:12:53AM +0100, Stephen Rothwell wrote:
> Hi Will,
Hi Stephen,
> Today's linux-next merge of the arm-perf tree got a conflict in arch/arm/kernel/perf_event_cpu.c between commit 338d9dd3e2ae ("ARM:
> 8351/1: perf: don't warn about missing interrupt-affinity property for
> PPIs") (and others) from Linus' tree and commit 74cf0bc75f16 ("arm:
> perf: unify perf_event{,_cpu}.c") from the arm-perf tree.
>
> I fixed it up (the changes from Linus' tree have been included in the
> arm-perf tree change, so I just removed the file) and can carry the fix
> as necessary (no action is required).
That's the correct resolution, thanks again.
Will
prev parent reply other threads:[~2015-06-01 9:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-01 0:12 linux-next: manual merge of the arm-perf tree with the tree Stephen Rothwell
2015-06-01 9:52 ` Will Deacon [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=20150601095223.GE1641@arm.com \
--to=will.deacon@arm.com \
--cc=Mark.Rutland@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.