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,
Alexey Dobriyan <adobriyan@gmail.com>,
David Miller <davem@davemloft.net>,
netdev@vger.kernel.org, Linus <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>
Subject: Re: linux-next: manual merge of the percpu tree with the net tree
Date: Wed, 03 Feb 2010 15:20:39 +0900 [thread overview]
Message-ID: <4B6915B7.4080806@kernel.org> (raw)
In-Reply-To: <20100203163803.820597d1.sfr@canb.auug.org.au>
Hello,
On 02/03/2010 02:38 PM, Stephen Rothwell wrote:
> Today's linux-next merge of the percpu tree got a conflict in
> net/ipv6/proc.c between commit 5833929cc2ad2b3064b4fac8c44e293972d240d8
> ("net: constify MIB name tables") from the net tree and commit
> d3f5fa4075414c7754126fbdc7c8fbd3906db7c8 ("percpu: add __percpu sparse
> annotations to net") from the percpu tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
>
> Maybe you guys could send Linus a simple one line patch for v2.6.33 that
> adds
>
> #define __percpu
>
> to include/linux/compiler.h (unconditionally) and then farm out the
> patches that add the __percpu annotations to other maintainers.
How about just adding dummy #define __percpu in each tree? I don't
think git will have much problem merging them.
--
tejun
next prev parent reply other threads:[~2010-02-03 6:20 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-03 5:38 linux-next: manual merge of the percpu tree with the net tree Stephen Rothwell
2010-02-03 5:38 ` Stephen Rothwell
2010-02-03 6:20 ` Tejun Heo [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-02-05 4:44 Stephen Rothwell
2010-02-05 4:44 ` 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=4B6915B7.4080806@kernel.org \
--to=tj@kernel.org \
--cc=adobriyan@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=cl@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=netdev@vger.kernel.org \
--cc=rusty@rustcorp.com.au \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.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 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.