into nuts.ninka.net:/home/davem/src/BK/sparc-2.5

it is an ex-parrot

assorted compile fixes

mtdblock switched to use of gendisks + compile fixes

z2ram.c switched to use of gendisks

ataflop.c switched to use of gendisks

amiflop.c switched to use of gendisks

macroectomy a-la pf.c and pcd.c ones, ditto for passing pointers to
structures instead of minors.

pd.c fed through Lindent

dumb expansion of macro - it had #define CURRENT current_req

tapeblock never assignes anything to its elements of blk_size[][]; we could
not bother allocating it in the first place.

More trivial fixes: typos in partitions/check.c, block/floppy.c and
acorn/block/fd1772.c + replacement of #define with inline in block/floppy.c
(fd_eject()).

Some trivial fixes for some typos introduced by Al's gendisk changes..

 - missing comma in cdu31a
 - missing semicolon in cdu31a
 - comma instead of colon in gscd
 - semicolon instead of comma in mcd
 - missing closing bracket in sonycd535

From Andries.

From davem: replace `unsigned' with size_t.

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