From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christoph Lameter <cl@linux-foundation•org>
Cc: linux-next@vger•kernel.org,
Andrew Morton <akpm@linux-foundation•org>,
Rusty Russell <rusty@rustcorp•com.au>,
Mike Travis <travis@sgi•com>, Ingo Molnar <mingo@elte•hu>
Subject: linux-next: manual merge of the cpu_alloc tree
Date: Tue, 28 Oct 2008 17:05:44 +1100 [thread overview]
Message-ID: <20081028170544.3658fb09.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 620 bytes --]
Hi Christoph,
Today's linux-next merge of the cpu_alloc tree got a conflict in
kernel/module.c between commit d3794979a8a80c222ce9d016a6dfc4bed36965d0
("Zero based percpu: infrastructure to rebase the per cpu area to zero")
from the tip-core tree and commit
3ba98730fe1feb5b3fd9747fa1d3d629cd7ec0f7 ("cpualloc: use cpu allocator
instead of the builtin modules per cpu allocator") from the cpu_alloc
tree.
The latter removed code that the former modified. I removed the code and
can carry this fix.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2008-10-28 6:05 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-28 6:05 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-10-28 5:58 linux-next: manual merge of the cpu_alloc tree Stephen Rothwell
2008-10-30 18:01 ` Christoph Lameter
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=20081028170544.3658fb09.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=cl@linux-foundation$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=rusty@rustcorp$(echo .)com.au \
--cc=travis@sgi$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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