Messages in this thread | | | Date | Mon, 1 Mar 2010 08:37:36 +0100 | From | Ingo Molnar <> | Subject | Re: linux-next: manual merge of the oprofile tree with Linus' tree |
| |
* 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
| |