From: Keith M Wesolowski <wesolows@foobazco.org>

As of 2.6.3, restore_flags will no longer modify cwp on sparc.
Therefore you can apply this patch to the locking guide.

[ Indeed.  I'll also remove the atomic comments from Hacking
  Guide as part of my revision there when I get back to it.  --RR ]

into home.osdl.org:/home/torvalds/v2.5/linux

into home.osdl.org:/home/torvalds/v2.5/linux

arch/arm/kernel/time.c: Fix time_before type warning.
arch/arm/common/amba.c: Fix snprintf compiler warning.

Thus fixes the weird kconfig message "optimize || ?", it's an old debug
check and is triggered by the unusual dependency.  It's not incorrect,
but the solution below is better and it's the same FB_MATROX_I2C already
uses.

I'll send a fix for the kconfig message later.

into home.osdl.org:/home/torvalds/v2.5/linux

This backs out James' sysfs support for fbdev again.  It introduces a
big, race for every driver not converted to framebuffer_{alloc,release}
(that is every driver but Ben's new radeonfb).

I've left in framebuffer_{alloc,release} as stubs so drivers can be
converted to it gradually and once all drivers are done it can be
enabled again.

into home.osdl.org:/home/torvalds/v2.5/linux

into home.osdl.org:/home/torvalds/v2.5/linux

into home.osdl.org:/home/torvalds/v2.5/linux

Theres still more to do here, but at least the ifdef mess is gone. No
more checking for NULL before calling functions, that was playing with
fire. Oh yeah and lots more deletions :)

Clean up the debugger hooks, it was way too easy to screw up.
And we did. And Linus hit it.

- create CONFIG_DEBUGGER so we can enable kernel debugging options but not
  have any trace of debugger gunk.
- remove a bunch of xmon prototypes so no one gets the urge to call them
- Use die() instead of panic in a number of places, it gives us much better
  debug information.
- Get rid of the ifdef madness

Heres a patch I've had for a while, it removes a bunch of debugger code
which is good :) The next patch will sanitise it (and the rest of the
debugger hooks).

Various xmon cleanups

- recover from bad SPR read/write (we get a program check)
- remove some old code (bat and segment register stuff)
- update the help text to match reality
- add a "press ? for help" when xmon first appears to make rusty happy
- protect against flushing bad parts of memory from Milton
- dont print iseries specific stuff on pseries in SPR dump (S)
- add code to dump the segment table or SLB
- remove a number of functions that wouldnt work on LPAR

- Add thread_info to pointer, its a useful piece of information.
- Do the kallsyms lookup on the link register
- Remove extra newline on one call to die()

From: Paul Mackerras <paulus@samba.org>

Recent changes in include/linux/*.h meant that likely()
isn't defined here (since we don't set __KERNEL__), and thus
we don't get some prototypes and we can't use do_div.  This
fixes the resulting compile errors and warnings.

Remove %L handling from sprintf - we don't need it, and it
meant we needed do_div from asm/div64.h, which gives problems
when __KERNEL__ isn't defined.  Also add a prototype for
strlen to kill a warning.

into kernel.bkbits.net:/home/davem/sctp-2.6

into kernel.bkbits.net:/home/davem/sparc-2.6

into kernel.bkbits.net:/home/davem/netfix-2.6

into nuts.davemloft.net:/disk1/BK/sctp-2.6

Also, un-inline large local_irq functions.

into intel.com:/home/lenb/src/linux-acpi-test-2.6.3

and we do _not_ want the broken MACZILOG serial driver.

This turned what _should_ have been a nice
easy oops into a nightmare of debugging.

Kernel debuggers suck.

I missed a kfree -> framebuffer_release() in the new radeonfb.

Thanks to Luca for noticing it.

Some drivers need clear_user_page, is should be exported

This avoids a link error if PPC_PMAC is set and the user forgets to set
ADB_PMU.  (The PMU driver is mandatory for pmac)

Also update copyrights for 2004.

From: Tom Rini <trini@kernel.crashing.org>

From: Randy Vinson <rvinson@mvista.com>

- Update the IBM Spruce defconfig