* linux-next: manual merge of the oprofile tree with Linus' tree
@ 2010-03-01 7:20 Stephen Rothwell
2010-03-01 7:37 ` Ingo Molnar
2010-03-01 9:34 ` Peter Zijlstra
0 siblings, 2 replies; 3+ messages in thread
From: Stephen Rothwell @ 2010-03-01 7:20 UTC (permalink / raw)
To: Robert Richter; +Cc: linux-next, linux-kernel, Peter Zijlstra
[-- 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the oprofile tree with Linus' tree
2010-03-01 7:20 linux-next: manual merge of the oprofile tree with Linus' tree Stephen Rothwell
@ 2010-03-01 7:37 ` Ingo Molnar
2010-03-01 9:34 ` Peter Zijlstra
1 sibling, 0 replies; 3+ messages in thread
From: Ingo Molnar @ 2010-03-01 7:37 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Robert Richter, linux-next, linux-kernel, Peter Zijlstra
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 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.
Robert: the oprofile tree shouldnt be changing perf_event code in any case,
please dont push out such patches to linux-next but feed them through the
usual channels.
Thanks,
Ingo
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the oprofile tree with Linus' tree
2010-03-01 7:20 linux-next: manual merge of the oprofile tree with Linus' tree Stephen Rothwell
2010-03-01 7:37 ` Ingo Molnar
@ 2010-03-01 9:34 ` Peter Zijlstra
1 sibling, 0 replies; 3+ messages in thread
From: Peter Zijlstra @ 2010-03-01 9:34 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Robert Richter, linux-next, linux-kernel
On Mon, 2010-03-01 at 18:20 +1100, Stephen Rothwell wrote:
> 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 .
The oprofile tree should _not_ carry perf patches.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-03-01 9:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-01 7:20 linux-next: manual merge of the oprofile tree with Linus' tree Stephen Rothwell
2010-03-01 7:37 ` Ingo Molnar
2010-03-01 9:34 ` Peter Zijlstra
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).