From: Tejun Heo <tj@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Rusty Russell <rusty@rustcorp.com.au>,
Christoph Lameter <cl@linux-foundation.org>,
Ingo Molnar <mingo@elte.hu>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the percpu tree with Linus' tree
Date: Mon, 07 Sep 2009 17:36:56 +0900 [thread overview]
Message-ID: <4AA4C628.3070300@kernel.org> (raw)
In-Reply-To: <20090907182229.734c31d2.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the percpu tree got a conflict in mm/percpu.c
> between commit 04a13c7c632e1fe04a5f6e6c83565d2559e37598 ("percpu: don't
> assume existence of cpu0") from Linus' tree and commit pcpu_chunk_page_occupied ("percpu: drop pcpu_chunk->page[]") from the percpu tree.
>
> I *think* the changes in the percpu tree supercede those in Linus' tree,
> so I have used those.
Yes, the changes in Linus's tree are backported from devel branch but
the devel already has moved on and dropped one of the changes. I'll
merge Linus's tree into percpu devel branch.
Thanks.
--
tejun
next prev parent reply other threads:[~2009-09-07 8:37 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-07 8:22 linux-next: manual merge of the percpu tree with Linus' tree Stephen Rothwell
2009-09-07 8:36 ` Tejun Heo [this message]
2009-09-07 10:24 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2009-10-30 8:20 Stephen Rothwell
2009-10-30 10:02 ` Tejun Heo
2009-10-31 4:23 ` Stephen Rothwell
2009-07-01 7:25 Stephen Rothwell
2009-07-01 7:19 Stephen Rothwell
2009-06-29 5:33 Stephen Rothwell
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=4AA4C628.3070300@kernel.org \
--to=tj@kernel.org \
--cc=cl@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=rusty@rustcorp.com.au \
--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