From: Ingo Molnar <mingo@elte.hu>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Robert Richter <robert.richter@amd.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: Re: linux-next: manual merge of the oprofile tree with Linus' tree
Date: Mon, 1 Mar 2010 08:37:36 +0100 [thread overview]
Message-ID: <20100301073736.GA1453@elte.hu> (raw)
In-Reply-To: <20100301182001.f67b21ac.sfr@canb.auug.org.au>
* 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
next prev parent reply other threads:[~2010-03-01 7:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
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=20100301073736.GA1453@elte.hu \
--to=mingo@elte.hu \
--cc=a.p.zijlstra@chello.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=robert.richter@amd.com \
--cc=sfr@canb.auug.org.au \
/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