From: Pekka Enberg <penberg@cs.helsinki.fi>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Tejun Heo <tj@kernel.org>, 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 the slab tree
Date: Tue, 01 Dec 2009 08:46:03 +0200 [thread overview]
Message-ID: <4B14BBAB.90105@cs.helsinki.fi> (raw)
In-Reply-To: <20091201174349.f72f36bd.sfr@canb.auug.org.au>
Stephen Rothwell kirjoitti:
> Hi all,
>
> Today's linux-next merge of the percpu tree got a conflict in mm/slab.c
> between commit ce79ddc8e2376a9a93c7d42daf89bfcbb9187e62 ("SLAB: Fix
> lockdep annotations for CPU hotplug") from the slab tree and commit
> 1871e52c76dd95895caeb772f845a1718dcbcd75 ("percpu: make percpu symbols
> under kernel/ and mm/ unique") from the percpu tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
The fixup looks good to me. Thanks, Stephen!
Pekka
prev parent reply other threads:[~2009-12-01 6:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-01 6:43 linux-next: manual merge of the percpu tree with the slab tree Stephen Rothwell
2009-12-01 6:46 ` Pekka Enberg [this message]
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=4B14BBAB.90105@cs.helsinki.fi \
--to=penberg@cs.helsinki.fi \
--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 \
--cc=tj@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).