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

Signed-off-by: David S. Miller <davem@redhat.com>

Do not release lock unless actually taken.
Noticed by Eric Lemoine.
Signed-off-by: David S. Miller <davem@redhat.com>

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@redhat.com>

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@redhat.com>

Signed single-bit bitfields really are a pretty strange
thing to have. They work, but it wasn't really intentional.

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

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

net/ipv4/proc.c was updated to use a new mechanism for outputting
/proc/net/snmp and /proc/net/netstat.

However, a superfluous '\n' snuck in, breaking `netstat -s`

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

This one from Dave Jones, who read the Intel docs even
more.

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

It seems that on some OldWolrd macs, we don't get the OF stdout device,
thus the new set_preferred_console() dies at boot trying to dereference
a NULL pointer.

Trivial fix.

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

into pobox.com:/spare/repo/netdev-2.6/ALL

In 2.5.18 some minix-specific stuff was moved to the minix subdirectory
where it belonged.  However, a typo crept in, causing inode disk usage
to be incorrectly reported.  A few people have complained, but so far
not sufficiently loudly.
Signed-off-by: Andries Brouwer <Andries.Brouwer@cwi.nl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

There are a couple of cache descriptors in the current Intel manuals
missing from our tables at least one of which appears in an actual
processor in the real world.

A silly bug prevented certain events from being used.

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

This got accidentally reverted in merging HPT372N support. The following
patch restores 50Mhz on the HPT374 using the 370a clocking tables.

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

Fix some Kconfig dependencies on PA-RISC (Grant Grundler, Martin Schulze,
					  Helge Deller, Matthew Wilcox)

Define acpi_noirq on ia64 since it's used now in pci_link.c.  All ia64
machines use ACPI, so we can just define it to 0 like we do for acpi_disabled 
and acpi_pci_disabled.
Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

PA-RISC sound updates:

 - Do a DAC/ADC reset for sampling rate changes in ad1889 (Randolph Chung)
 - Set the ad1889 interrupt configuration properly (Randolph Chung)
 - Fix dependency for the OSS Harmony driver (Thibaut Varene)
 - Forward port Stuart Brady's 2.4 Harmony driver patches (Thibaut Varene)
   - Fix sample skipping (Stuart Brady)
   - Prevent harmony_silence being called wrongly (Stuart Brady)
   - Fix crash caused by buf_to_fill becoming -1 (Stuart Brady)
   - Improve naming of mixer channels (Stuart Brady)
   - Implement SNDCTL_DSP_CHANNELS ioctl (Stuart Brady)
   - Improve toggling the recording source (Stuart Brady)
   - Sanity check MIXER_WRITE volume levels (Stuart Brady)
   - Fix MIXER_READ right_level return (Stuart Brady)
   - Reject AFMT_S16_LE format (Stuart Brady)
 - Fail OSS Harmony initialisation if no irq (Helge Deller)
 - Fix typos in ALSA Harmony (Andy Walker, Grant Grundler, Stuart Brady)

From: Francois Romieu <romieu@fr.zoreil.com>

Help message (2.4.x port + module name) for the configuration of vlan
support.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@redhat.com>

From: Jeremy Fitzhardinge <jeremy@goop.org>
Signed-off-by: Dave Jones <davej@redhat.com>

The watchdog drivers use a VFS implementation and thus should not be
lseek'able, so we put a '.llseek = no_llseek' in the file_operations
structure.

cpu5wdt also contains a VFS and thus should be "nonseekable_open"

Fix example program in pcwd-watchdog.txt document.

The watchdog ioctl interface is defined correctly for 32 bit emulation,
although WIOC_GETSUPPORT was not marked as such, for an unclear reason.
WDIOC_SETTIMEOUT and WDIOC_GETTIMEOUT were added in may 2002 to the
code but never to the ioctl list. This adds all three definitions.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@redhat.com>

Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@redhat.com>

Since skb_checksum_help() has been moved to xfrm[46]_output(), we don't
need the sk_buff ** argument in x->type->output anymore.  This patch
reverts it to a sk_buff *.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@redhat.com>

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

Signed-off-by: David S. Miller <davem@redhat.com>

newer bit features than the kernel.

SGI Modid: xfs-linux:xfs-kern:177392a
Signed-off-by: Nathan Scott <nathans@sgi.com>

SGI Modid: xfs-linux:xfs-kern:177165a
Signed-off-by: Nathan Scott <nathans@sgi.com>

SGI Modid: xfs-linux:xfs-kern:177164a
Signed-off-by: Nathan Scott <nathans@sgi.com>