Signed-off-by:  Steve French (sfrench@us.ibm.com)

into hostme.bitkeeper.com:/repos/c/cifs/linux-2.5cifs

Signed-off-by: Steve French (sfrench@us.ibm.com)

into tiger.hpl.hp.com:/data1/bk/lia64/to-linus-2.5

	Wrong ifdef around ppc nvram_read_byte() - it should be
CONFIG_GENERIC_NVRAM.

[that's it for today; there's more (fb stuff), but I'd rather make that
a separate series]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

	compile fixes in open_pic.c - it missed cpumask conversion in several
places.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

	usual "shift definition of inlines before their uses" in a couple of
places in drivers/*
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

	a couple of "replace char with explicit s8 to make sure it's really
signed" fixes.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

	a) ppc KGDB builds only on two subarch; say so in Kconfig
	b) ide-pmac.c can't be a module; make it dependent on IDE=y.
	c) a bunch of isdn drivers is broken on ppc; marked as such
	d) oaknet is broken; marked as such (includes on files that do not
exist, etc.)
	e) buslogic and cyber2000 are broken on sparc64
	f) s3trio framebuffer is broken
	g) usual 8250-based serial is broken on sparc64; in principle it might
be worth supporting (there are PCI cards of that sort), for now marked as
broken (no asm/serial.h, to start with).
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Usual foo ? void : non-void  in reiserfs; gets triggered on big-endian
platforms.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

	asm-ppc/reg.h defines pollutes namespace like there's no tomorrow;
among other things there are
	LR
	SR0...SR15
	DEC
etc.

That breaks quite a few drivers that should otherwise work on ppc.  SR...
and LR were never used by ppc code; commented out in reg.h (note that
they are just aliases for SPRN_SR... and SPRN_LR).  RPA commented out and
its instances in ppc code (all four of them) replaced with SPRN_RPA.  Ditto
for DEC.  The rest of the offenders (DAR and PVR) are left alone for now and
#undef'ed in drivers in question.

We probably want to rip all these guys out of reg.h and convert ppc users
to SPRN_... forms - file ends up included in alot of places and namespace
pollution like that is a Bad Thing(tm).
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Assorted pointer-to-int fixes:
	a) some places want to take pointer modulo alignment or extract
integer that was cast to pointer (which is legitimate), but do that via
wrong cast, triggering sparse warnings.
	b) usual %x (int)ptr -> %p ptr fixes
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Either it got missed back when if_mii() was introduced, or it got merged
that way later.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

zoran procfs code switched to seq_file and cleaned up; a bunch of homegrown
procfs glue eliminated.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

cciss compat ioctls were broken (mixing kernel and userland pointers);
fixed (and cleaned up) by switch to compat_alloc_user_space() and elimination
of set_fs().
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Usual set - explicit -D<arch>=1 for sparse, __sighandler_t / __sigrestore_t
annotated, annotations in arch/ppc/kernel/*, etc. - same as for other platforms
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

CONFIG_MCOUNT on sparc64 is currently broken; we have both mcount and _mcount
declared (and aliased to each other), but end up exporting the wrong one.  As
the result, with that option all modules get unresolved symbol.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

it could be split (all chunks are obviously independent), but I don't think
that it's worth doing.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

blind dereferencing of userland pointer
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

0->NULL in arch/ppc and include/asm-ppc.

[That's it for this series - there's still ~200Kb to merge, but I'd rather
take a break for a couple of hours before dealing with the rest]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

annotated, a bunch of ioctls switched to compat_alloc_user_space() and
cleaned up.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

trivial annotations and cleanups + proper use of vfs_...stat().
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

That definitely duplicates a bunch of stuff in pending patches from various
folks, but since it's all trivial 0->NULL replacements and patches are still
not submitted and/or merged...
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Assorted mtd fixes.
	a) NULL noise removal
	b) %p pointer instead of %x (int)pointer in printks
	c) missed iovec->kvec replacements (basically, fixing merge problems)
	d) fixed type for (unused) last argument in doc_{read,write}_ecc()
	e) sanitized some comparisons.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

drivers/char/ipmi/* annotated, structure shared between kernel and
userland (ioctls) split in two.
ACPI callback in the same code used to have wrong type - it should've been
void (...), not u32 (...).  Fixed.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

bpck6 was b0rken on ppc in rather amusing way - it used
typedef struct ... PPC;
which doesn't mix with having PPC (pre)defined to 1.  Fixed by renaming private
typedef in question.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

added missing #include
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

a) OSS is broken on sparc64 (as in "won't compile")
b) sb16_csp is broken on ppc
marked as such in Kconfig
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

a) ALSA variant of wavefront didn't compile on gcc 2.x with debugging
turned on - authors heard something about variadic macros on gcc 2.x,
but screwed it up.  Fixed.
b) au88x0 relied on char being signed in non-trivial ways.  On ppc it's
not true.  Fixed by explicit use of s8 (which is what that code really
wants).
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

dmasound (core + ppc-specific parts) annotated
Signed-off-by: Linus Torvalds <torvalds@osdl.org>