From: Tejun Heo <tj@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the slabh tree with the percpu tree
Date: Wed, 31 Mar 2010 11:44:04 +0900 [thread overview]
Message-ID: <4BB2B6F4.6010701@kernel.org> (raw)
In-Reply-To: <20100330172253.de55195b.sfr@canb.auug.org.au>
On 03/30/2010 03:22 PM, Stephen Rothwell wrote:
> Hi Tejun,
>
> Today's linux-next merge of the slabh tree got a conflict in
> include/linux/percpu.h between commit
> 10fad5e46f6c7bdfb01b1a012380a38e3c6ab346 ("percpu, module: implement and
> use is_kernel/module_percpu_address()") from the percpu tree and commit
> d103d3b3e8512312b5254950035366d4422a479a ("percpu: don't implicitly
> include slab.h from percpu.h") from the slabh tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Thanks. I'll soon push the stuff in percpu#for-next to mainline
(they're fixes) and merge it into slabh.
--
tejun
prev parent reply other threads:[~2010-03-31 2:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-30 6:22 linux-next: manual merge of the slabh tree with the percpu tree Stephen Rothwell
2010-03-31 2:44 ` Tejun Heo [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=4BB2B6F4.6010701@kernel.org \
--to=tj@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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 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.