into home.transmeta.com:/home/torvalds/v2.5/linux

into mandrakesoft.com:/home/jgarzik/repo/net-drivers-2.5

into mandrakesoft.com:/home/jgarzik/repo/net-drivers-2.5

(releases memory block after read out)

[note - more work needs to be done here, but this is better than
nothing -jgarzik]

floppies and CD's in /proc/partitions.

Some idiot (OK, it was me) broke free_area_init_node for
non discontigmem systems that call it directly (eg sparc64),
during a recent cleanup, thus invoking the wrath of DaveM.

I know Dave sent you a patch yesterday, but I think the BUG
statement in it will break anyone who just uses free_area_init
(eg any PC). So here's a portion of Dave's patch that should
fix things for everyone I think. Unfortunately my non-NUMA
test box is borked right now, but it just removes the BUG
statement from what he tested, and it's so simple that even
I couldn't screw this up (famous last words).

This code really needs some more cleanup work, but this will
fix it for now so everyone can do their work ...

into home.transmeta.com:/home/torvalds/v2.5/linux

swim_iop switched to use of gendisk

acorn floppy switched to use of gendisk

xpram switched to use of gendisk

nbd switched to use of gendisk

rd switched to use of gendisk

stram switched to use of gendisk

sonycd switched to use of gendisk; missing initcall restored

sjcd switched to use of gendisk; missing initcall restored

optcd switched to use of gendisk; missing initcall restored

gscd switched to use of gendisk; missing initcall restored

aztcd switched to use of gendisk; missing initcall restored (aztcd_init()
and friends used to be called directly from blk_dev_init(); apparently
the first step of bio merge had killed these calls but left module_init() in
these drivers under #ifdef MODULE).

loop switched to use of gendisk

swim3 switched to use of gendisk

That's a tricky one and large part of that stuff is temporary - it will be
replaced as soon as we have gendisks for all block devices and get sane
refcounting for gendisks.
	* we add per-major lists of gendisks; get_gendisk() looks into
appropriate list instead of looking through the list of all gendisks.
	* we allow driver to override that search - it can call
blk_set_probe(major, probe) and then gendisk will call probe(minor).
blk_set_probe(major, NULL) restores the default behaviour.
	* floppy.c switched to use of gendisks; we have one gendisk per
disk and let floppy_find(minor) return the right one.
	Note that final mechanism will involve a similar construction
but floppy.c is actually the least interesting application - places
where it will really play will include stuff like loading the right
high-level driver when we open /dev/hdX, etc.  And it won't be major-based...

partition_name() moved from md.c to partitions/check.c; disk_name() is not
exported anymore; partition_name() takes dev_t instead of kdev_t.

Almost all callers of add_gendisk() were immediately followed by
register_disk(disk, mk_kdev(disk->major,disk->first_minor),
	      1<<disk->minor_shift, disk->fops, something);
The only exception (DAC960.c) massaged to that form.
New helper (add_disk(disk)) introduced and aforementioned sequence
replaced with
	set_capacity(disk, something);
	add_disk(disk);

pf switched to use of gendisk and cleaned up - we pass pointers to structures
instead of minors now.

pf.c fed through lindent

beginning of macroectomy in pf.c: RR and WR macros replaced with saner
inlines a-la pcd.c

mtdblock_ro switched to use of gendisk, both mtdblock.c and mtdblock_ro.c
slightly cleaned up.

jsflash switched to use of gendisk

assorted minor cleanups

devfs-related stuff moved from cdrom.c and cdrom drivers to register_disk();
new flag (GENHD_FL_CD) marks gendisks that need such treatment.

sbpcd switched to use of gendisk

mcdx switched to use of gendisk

mcd switched to use of gendisk, failure path in module_init cleaned up