Hi Tajun,
On Fri, 12 Feb 2010 17:21:20 +0900 Tejun Heo <tj@xxxxxxxxxx> wrote:
>
> On 02/05/2010 02:16 PM, Stephen Rothwell wrote:
> > From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> > Date: Fri, 5 Feb 2010 16:09:11 +1100
> > Subject: [PATCH] percpu: add __percpu for sparse
> >
> > This is to make the annotation of percpu variables during the next merge
> > window less painfull.
> >
> > Extracted from a patch by Rusty Russell.
>
> I started doing this and it's a bit ridiculous. If I split the
> patches into separate trees with maintainers, I end up with a lot of
> one or several liners and all that those patches do is adding __percpu
> to a variable or field declaration which doesn't affect normal builds
> at all. The only conflicts I had against the current mainline is the
> ones which got changed in the percpu tree by Christoph's patches.
>
> Given the wide number of trees this will end up on and given the
> triviality of each change, I think it would better to keep these in
> the percpu tree. It'll make things harder track without adding much
> benefit. If non-trivial confict ever happens, please feel free to
> drop it from linux-next and let me know.
You don't need to split them all out, just the problematic ones.
A good start would be commit d3f5fa4075414c7754126fbdc7c8fbd3906db7c8
("percpu: add __percpu sparse annotations to net"). You would need to
rebase it on top of net-next and note that "struct macvlan_dev" has been
moved to include/linux/if_macvlan.h. Then just send it to DaveM.
You could also send commit e20b68160144bcacbde008b9cf7df4e1544b2507
("percpu: add __percpu sparse annotations to net drivers") along with it.
Commit 949c49c93a02b62278a63457d0d3192d66e55105 ("percpu: add __percpu
sparse annotations to x86") can just go to the x86 guys and commit
0b6dd45041220083a3692edae5253c35d19bcb2b ("percpu: add __percpu sparse
annotations to hw_breakpoint") to Frederic Weisbecker.
Commit eeb721be6bc03fe37755e69ab5c3ba2fe9897fd9 ("percpu: add __percpu
sparse annotations to trace") needs rebasing onto the tip perf/core
branch and then could be sent to Steve and co.
That takes care of most of it and the rest, as you say, we can sort out
if it becomes a problem.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpqY4LHS4wkD.pgp
Description: PGP signature
