From: Galen Michael Elias <gme@citi.umich.edu>

  This patch fixes two places where the handling of page boundaries was
incorrect and caused to IO_ERR's when it shouldn't have.

1.  In decode_write it was just a small typo.
2.  In decode_compound we avoid using READ_BUF, but don't provide all of
it's functionality, specifically crosses a page boundary.

Though the nfsd module can create this, having it always
there makes auto-loading-on-mount work better.

Note: it was previously recommended that the nfsd filesystem be mounted
on /proc/fs/nfs, which I was never comfortable with.
Henceforth the recommended location will be /proc/fs/nfsd.
nfs-utils 1.0.6 and later will support both.

Such a request would cause the nul terminator to be written
to some other page, and cause havoc.

Also rearrange two tests to avoid the possibility of testing the byte
just past the end of a buffer - doing so can causes an oops with appropriate
kernel-debug config options

The 'acl' folks would like an export flag, so this patch
reserves one and also discards some that aren't used and never
will be (for the named purpose).

NFSEXP_CROSSMNT used to mean something different, so
using a different name reduces the chance of confusion.
Also there is currently a surplus of vowels, so there is
no need to be frugal

When a sunrpc/cache channel is not open for reading, the
cache doesn't bother making and waiting for up-calls.

However it doesn't currently distingish between open-for-read/write
and open-for-write, so an op-for-write will look like a reader
and will cause inappropriate waiting.

This patch checks if a file is open-for-read and will only register
a file as a reader if it really is one.

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

Resided in arch/i386/kernel/dmi_scan.c and was not used by any of the 
blacklist functions. If it turns out to required, we can add it back later.

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

So make sure to include it in <asm-i386/hardirq.h> when needed
(ie for the CONFIG_PREEMPT case).

Fix up a few places where we marked __initdata as being const.

This causes a section conflict (init section vs .rodata)

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

constant values should not end up in the BSS.

We're better off having the compiler put it in the .rodata
section (which it will, thanks to the initializer and the
"const"), since that will result in it being nicely cacheable
in shared SMP caches.

into hostme.bitkeeper.com:/repos/l/linux-watchdog/linux-2.5-watchdog

use module_param, removed __setup code,
general cleanup (mostly of comments and trailing spaces, also removed include of config.h),
made the watchdog's timeout a module_param.

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

into samba.org:/home/paulus/kernel/for-linus-ppc

into samba.org:/home/paulus/kernel/for-linus-ppc

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

into samba.org:/scratch/anton/tmp3

into samba.org:/scratch/anton/tmp3

into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-power

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

into samba.org:/scratch/anton/tmp3

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

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

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

1. pci_device_id structures shouldn't be __devinitdata.  Greg removed
   all of the instances of this in the 2.6.0-test1 tree, but unforunately
   my recent coversion of lanai.c introduced another one.

2. The lanai PCI id constants have now been merged into the kernel headers
   so we don't need to define our own copies.

3. The ioctl's exported by lanai shouldn't be - they were intended for
   debugging only, never for release.  For now they're just '#if 0'ed out.
   They're somewhat dangerous since they don't check any capabilities so
   any user could DoS the interface.

Orginally from Pavel Machek.

- Create kernel/power/console.c
- Rename prepare_suspend_console() to pm_prepare_console() and 
  restore_console() to pm_restore_console().
- Add prototypes to include/linux/suspend.h.
- Make kernel/power/console.o dependent only on CONFIG_PM
- Simplify logic for SUSPEND_CONSOLE define
- Make software_resume() prepare console much earlier, so we can localize
  the loglevel variables in console.c. 
- Remove #ifdef CONFIG_VT from console.c, and just check for SUSPEND_CONSOLE.
  (Perhaps we should make entire file dependent on CONFIG_VT_CONSOLE?)
- Add kernel/power/power.h to share things across local files.