From: Tejun Heo <tj@kernel.org>
To: Pekka Enberg <penberg@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Pekka Enberg <penberg@cs.helsinki.fi>,
Christoph Lameter <cl@linux-foundation.org>
Subject: Re: linux-next: manual merge of the tip tree with the slab tree
Date: Thu, 23 Sep 2010 11:46:34 +0200 [thread overview]
Message-ID: <4C9B21FA.4050504@kernel.org> (raw)
In-Reply-To: <AANLkTim=uZuC1gt6qL7+KMdgnnx4e4Hh2Zs=SdjJXv5W@mail.gmail.com>
On 09/23/2010 11:33 AM, Pekka Enberg wrote:
> On Thu, Sep 23, 2010 at 6:44 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Today's linux-next merge of the tip tree got a conflict in
>> include/linux/percpu.h between commit
>> 6fc80ef491b981f59233beaf6aeaccc0c947031d ("percpu: use percpu allocator
>> on UP too") from the slab tree and commit
>> 8b8e2ec1eeca7f6941bc81cefc9663018d6ceb57 ("percpu: Add {get,put}
>> _cpu_ptr") from the tip tree.
>>
>> Just context changes. I fixed it up (see below) and can carry the fix as
>> necessary.
>
> Why are we seeing a merge conflict here? I cherry-picked patches from
> Tejun's for-next branch but didn't modify them.
That's a different one coming from the perf tree. get_cpu_ptr() is
only used by perf at this point so it got routed through there, so the
conflict. Nothing to worry about.
Thanks.
--
tejun
next prev parent reply other threads:[~2010-09-23 9:48 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-23 3:44 linux-next: manual merge of the tip tree with the slab tree Stephen Rothwell
2010-09-23 9:33 ` Pekka Enberg
2010-09-23 9:46 ` Tejun Heo [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-06-21 3:48 Stephen Rothwell
2012-06-21 7:24 ` David Rientjes
[not found] <20090706144051.06d079a5.sfr@canb.auug.org.au>
2009-07-06 8:01 ` Pekka Enberg
[not found] ` <20090914155219.13118819.sfr@canb.auug.org.au>
2009-09-14 6:35 ` Pekka Enberg
2009-06-16 5:46 Stephen Rothwell
2009-06-16 5:48 ` Pekka Enberg
2009-06-16 7:44 ` Ingo Molnar
2009-06-16 7:46 ` Pekka Enberg
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=4C9B21FA.4050504@kernel.org \
--to=tj@kernel.org \
--cc=cl@linux-foundation.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=penberg@cs.helsinki.fi \
--cc=penberg@kernel.org \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.