Re: [PATCH] remove duplicate #includes

[Andrew Morton <akpm@osdl.org>]

Jean Delvare <khali@linux-fr.org> wrote:
>
> Hi Herbert,
> 
> > recently I stumbled over a few files which #include the 
> > same .h file twice -- sometimes even in the immediately
> > following line. so I thought I'd look into that to reduce 
> > the amount of duplicate includes in the kernel ...
> > (...)
> > diff -NurpP --minimal linux-2.6.16-rc2/drivers/macintosh/therm_pm72.c linux-2.6.16-rc2-mpf/drivers/macintosh/therm_pm72.c
> > --- linux-2.6.16-rc2/drivers/macintosh/therm_pm72.c	2006-02-07 11:52:31 +0100
> > +++ linux-2.6.16-rc2-mpf/drivers/macintosh/therm_pm72.c	2006-02-13 02:07:58 +0100
> > @@ -104,7 +104,6 @@
> >  #include <linux/kernel.h>
> >  #include <linux/delay.h>
> >  #include <linux/sched.h>
> > -#include <linux/i2c.h>
> >  #include <linux/slab.h>
> >  #include <linux/init.h>
> >  #include <linux/spinlock.h>
> 
> This one was already taken care of in a different patch:
> 
> http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16-rc3/2.6.16-rc3-mm1/broken-out/macintosh-cleanup-the-use-of-i2c-headers.patch
> 
> So please exclude this part from your patch so as to avoid collisions.
> 

Is OK.  I'll stage the big cleanup patches like this after everyone else's
patches, so all that is left in this patch is stuff which doesn't intersect
with anyone else's work.

That's one of the advantages of having everyone's development trees all in
one place.  (And people who run development trees which aren't in -mm lose).