lkml.org 
[lkml]   [2010]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the oprofile tree with Linus' tree
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/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2010-03-01 08:23    [W:2.972 / U:0.592 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site