Re: [GIT PULL linux-next] break implicit percpu.h -> slab.hdependency

[Stephen Rothwell]

Hi Tejun,

On Mon, 29 Mar 2010 10:00:44 +0900 Tejun Heo <tj@xxxxxxxxxx> wrote:
>
> Can you please pull the following into linux-next?
> 
>  git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git slabh
> 
> The tree breaks implicit slab.h inclusion from percpu.h.  It turned
> out that a lot of .c files assumed slab/gfp availability w/o actually
> including the respective header, so the conversion ended up modifying
> includes on over 4000 files.
> 
> I don't expect there to be a lot of conflicts and the ones which
> happen should be straight forward to resolve.  Albeit large in volume,
> the changes being mostly trivial, I'm hoping to push this into Linus
> tree soonish (ie. during this devel cycle), so the tree hopefully will
> go away soon.
> 
> Please read the following thread for details.
> 
>  http://thread.gmane.org/gmane.linux.kernel/965549

As you are aware, I included your tree in linux-next today :-)

There were a few conflicts:

CONFLICT (content): Merge conflict in drivers/char/sysrq.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/r300.c
CONFLICT (content): Merge conflict in drivers/hid/hid-wacom.c
CONFLICT (content): Merge conflict in drivers/media/video/soc_camera.c
CONFLICT (content): Merge conflict in drivers/net/wireless/wl12xx/wl1271_cmd.c
CONFLICT (content): Merge conflict in drivers/net/wireless/wl12xx/wl1271_main.c
CONFLICT (content): Merge conflict in drivers/net/wireless/wl12xx/wl1271_spi.c
CONFLICT (content): Merge conflict in drivers/pcmcia/pcmcia_resource.c
CONFLICT (content): Merge conflict in drivers/s390/char/vmcp.c
CONFLICT (content): Merge conflict in drivers/staging/cx25821/cx25821-audio-upstream.c
CONFLICT (content): Merge conflict in kernel/audit_watch.c
CONFLICT (content): Merge conflict in net/mac80211/scan.c
CONFLICT (delete/modify): sound/soc/codecs/ad1938.c deleted in HEAD and modified in slabh/slabh. Version slabh/slabh of sound/soc/codecs/ad1938.c left in tree.

Almost all of these were simple and I just fixed them up.

And you saw the reports for the build errors.  Some of these have already
been fixed.  The rest I can carry until (hopefully) they are picked up by
their respective maintainers.

Thanks for adding your subsystem tree as a participant of linux-next.  As
you may know, this is not a judgment of your code.  The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window. 

You will need to ensure that the patches/commits in your tree/series have
been:
     * submitted under GPL v2 (or later) and include the Contributor's
	Signed-off-by,
     * posted to the relevant mailing list,
     * reviewed by you (or another maintainer of your subsystem tree),
     * successfully unit tested, and 
     * destined for the current or next Linux merge window.

Basically, this should be just what you would send to Linus (or ask him
to fetch).  It is allowed to be rebased if you deem it necessary.

-- 
Cheers,
Stephen Rothwell 
sfr@xxxxxxxxxxxxxxxx

Legal Stuff:
By participating in linux-next, your subsystem tree contributions are
public and will be included in the linux-next trees.  You may be sent
e-mail messages indicating errors or other issues when the
patches/commits from your subsystem tree are merged and tested in
linux-next.  These messages may also be cross-posted to the linux-next
mailing list, the linux-kernel mailing list, etc.  The linux-next tree
project and IBM (my employer) make no warranties regarding the linux-next
project, the testing procedures, the results, the e-mails, etc.  If you
don't agree to these ground rules, let me know and I'll remove your tree
from participation in linux-next.

Attachment: pgp00000.pgp
Description: PGP signature