From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Robert Richter <robert.richter@amd•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Peter Zijlstra <a.p.zijlstra@chello•nl>
Subject: linux-next: manual merge of the oprofile tree with Linus' tree
Date: Mon, 1 Mar 2010 18:20:01 +1100 [thread overview]
Message-ID: <20100301182001.f67b21ac.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 828 bytes --]
Hi Robert,
Today's linux-next merge of the oprofile tree got a conflict in
arch/x86/kernel/cpu/perf_event.c between commit
8c48e444191de0ff84e85d41180d7bc3e74f14ef ("perf_events, x86: Implement
intel core solo/duo support") from Linus' tree and commit
27d4a358bf5ef730aacf50696b9b5dfc5e2a87a5 ("perf, x86: rename macro in
ARCH_PERFMON_EVENTSEL_ENABLE") from the oprofile tree.
I fixed it up (by using the version from Linus' tree and substituting
ARCH_PERFMON_EVENTSEL_ENABLE for ARCH_PERFMON_EVENTSEL0_ENABLE) and can
carry the fix for a while. I also did the same substitution in
arch/x86/kernel/cpu/perf_event_p6.c .
It would be good if you did a merge with Linus' tree and fixed these up,
thanks.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next reply other threads:[~2010-03-01 7:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-01 7:20 Stephen Rothwell [this message]
2010-03-01 7:37 ` linux-next: manual merge of the oprofile tree with Linus' tree Ingo Molnar
2010-03-01 9:34 ` Peter Zijlstra
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=20100301182001.f67b21ac.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=a.p.zijlstra@chello$(echo .)nl \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=robert.richter@amd$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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