From: will.deacon@arm.com (Will Deacon)
To: linux-arm-kernel@lists.infradead.org
Subject: perf_event_v7.c compilation failure in next-20120523
Date: Wed, 23 May 2012 18:05:29 +0100 [thread overview]
Message-ID: <20120523170528.GH26693@mudshark.cambridge.arm.com> (raw)
In-Reply-To: <4FBD1796.4030309@wwwdotorg.org>
On Wed, May 23, 2012 at 06:00:06PM +0100, Stephen Warren wrote:
> Will,
>
> In next-20120523, the following two commits of yours collided:
>
> d33c88c ARM: 7315/1: perf: add support for the Cortex-A7 PMU
> (adds new entry to perf_event_v7.c)
>
> b3426c5 ARM: perf: remove arm_perf_pmu_ids global enumeration
> (removes a field from entries in perf_event_v7.c)
Cheers Stephen. The former commit is actually in 3.4, so I must've missed
it when rebasing yesterday.
I'll update my for-next branch.
Thanks,
Will
prev parent reply other threads:[~2012-05-23 17:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-23 17:00 perf_event_v7.c compilation failure in next-20120523 Stephen Warren
2012-05-23 17:05 ` 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=20120523170528.GH26693@mudshark.cambridge.arm.com \
--to=will.deacon@arm.com \
--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