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

Errors should not be ignored, so add __must_check
tag to this function as well.
Signed-off-by: David S. Miller <davem@davemloft.net>

It appears that access to the PLL registers of the radeon chip is
unreliable while the card is in "legacy VGA" text mode. I don't have a
good explanation yet, it might be the BIOS mucking around behind my
back. This fixes the lockup by moving the code that enables/disables the
dynamic power management to after the mode is set.

I'm still waiting for a proper explanation from ATI...
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

CMSG reception needs to occur even if msg_name is not
set.
Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

This patch adds a net_device argument to ifdown.  After all,
it's a bit silly to notify someone of an ifdown event without
telling them what which device it was for :)
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

We checked the wrong byte, causing the touchpad
to lose sync if an absolute packet is received
after a relative packet with negative Y displacement.
Signed-off-by: Dmitry Torokhov <dtor_core@ameritech.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Noted while going through the n_tty code: that buffer check
used to check against the size of the temporary kernel buffer,
but since the tty layer was changed to use kernel buffers
though-out, the kernel buffer array became just a pointer, and
the check was limiting the opost blocksize to the size of a
pointer, which makes no sense.

Just remove it, since now the whole buffer is always in kernel
space.

into ppc970.osdl.org:/home/torvalds/v2.6/linux

The NTTY code can get confused by 4kB chunks, apparently
because n_tty_receive_room() will claim to have more room
than n_tty_receive_buf() can actually accept.

Until somebody figures out what the real n_tty_receive_room()
logic should be, let's just limit it to a safe 2kB.

Thanks go to Andreas Schwab for finding a test-case.

Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: David S. Miller <davem@davemloft.net>

On Sparc, if the user does not specify a mode option, we
should use the PROM probed values in default_var always.
Signed-off-by: David S. Miller <davem@davemloft.net>

cg3_blank() needs to clear the video enable register bit
to blank the screen, not set it.
Signed-off-by: David S. Miller <davem@davemloft.net>

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

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Add some missing __iomem annotations for Integrator machines.
Signed-off-by: Russell King <rmk@arm.linux.org.uk>

This adds some missing annotations found by making the raw IO
operations check their pointer type.
Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Patch from Ben Dooks

Fix the following:
arch/arm/mach-ixp2000/pci.c:148: warning: `cli' is deprecated (declared at include/linux/interrupt.h:65)
arch/arm/mach-ixp2000/pci.c:161: warning: `sti' is deprecated (declared at include/linux/interrupt.h:69)
arch/arm/mach-ixp2000/pci.c:178: warning: `cli' is deprecated (declared at include/linux/interrupt.h:65)
arch/arm/mach-ixp2000/pci.c:191: warning: `sti' is deprecated (declared at include/linux/interrupt.h:69)
By replacing cli() wht local_irq_save() and sti() with local_irq_restore().
This patch has not been tested.

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

Patch from Ben Dooks

Fix the following:
arch/arm/mach-ixp4xx/common.c:305: warning: initialization from incompatible pointer type

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

It is defined as a _IOW() which is erroneous, it should
have been defined as _IORW() but that cannot be changed
now without breaking all existing applications using this
ioctl.
Signed-off-by: David S. Miller <davem@davemloft.net>

this oneliner fixes the situation that I can enter a year to blacklist
ACPI devices even if ACPI is completely disabled.
Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

When the lockfs patches went in an important bit got lost, the call in
generic_file_write to put newly incoming writers to sleep when a filesystem
is frozen.  Nathan added back the call in the now separate XFS write patch,
and the patch for the generic code is below:
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The size of LAN bridged messages was not being returned properly from the
function that calculated address sizes.
Signed-off-by: Corey Minyard <minyard@acm.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

unifdef complains about the space before #ifndef.
Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

isdn_net_get_locked_lp is doing a local_bh_enable with hard IRQs disabled. 
This is not allowed.

The following patch fixes the problem by removing the unnecessary
local_bh_enable while the hard IRQs are disabled.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Patch from Thomas Gleixner

Remove NULL initializers of static variables.

Signed-off-by: Thomas Gleixner
Signed-off-by: Russell King

Patch from Thomas Gleixner

Trivial build fix for shannon platform

Signed-off-by: Thomas Gleixner
Signed-off-by: Russell King

Patch from Thomas Gleixner

Trivial build fix for badge4 platform

Signed-off-by: Thomas Gleixner
Signed-off-by: Russell King

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into pobox.com:/garz/repo/net-drivers-2.6