Signed-off-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>

Signed-off-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>

Move tcp sk_wmem_queued related functions to net/core/stream.c, will be
used by other SOCK_STREAM protocols, starting with LLC.

Also move the tcp_charge_skb to sock.h, for the same reasons.
Signed-off-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>

Will be used by the poor cousins, starting with LLC.
Signed-off-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>

Later patches will make other protocols use sk_wait_data and further generalisations
of tcp code will use sk_wait_event.

This is again to abstract away more stuff from poor network family writers, like
the SOCK_ASYNC_WAITDATA, etc.
Signed-off-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>

It was already generic, so reflect this in the naming.

Later patches will make it be used in other network families.

This makes the best practices already in place in bluetooth
and tcp/ip available for all protocols, i.e. references must
be managed when associating timers with struct sock instances,
also makes the code a bit more clean.
Signed-off-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>

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

Patch from Ben Dooks

Fix missing select of SERIAL_CORE_CONSOLE when selecting the
S3C2410 serial console support with no other serial console
selected

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

Patch from Marc Singer

Small change to support revision B Card Engines.

Patch from Marc Singer

This patch corrects a bug in the register access macros for 16 and 8
bit accesses.  It also updates the default configuration files for the
2.6.7 kernel.

Patch from Ben Dooks

Fix for multiple definition of the same item in the GPIO and IRQ
register includes

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

into dwmw2.baythorne.internal:/inst/bk/sbc8260-2.6

 - Switch to using u-boot bdinfo.
 - Set up CS11 for RTC if the bootloader didn't bother.
 - Set BOOTROM_RESTART_ADDR so machine_restart() actually works.
 - For non-uboot boot, note bus clock is 66MHz on 8265 model.

into dwmw2.baythorne.internal:/inst/bk/sbc8260-2.6

Stop downgrade_write() from under-adjusting the rwsem counter in optimised
rw-semaphores.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

Signed off by: Jesse Brandeburg

From: Carl-Daniel Hailfinger <c-d.hailfinger.kernel.2004@gmx.net>

Handle going-away devices.

This patch fixes an incorrect MCA check as well as a leak on probe
failure in at1700.

This patch frees the netdev on failure in mc32_probe in 3c527.

"Gee it works better if you turn the chip on before programming it"

The ioctl to ethtool change broke that little detail...


I made the changes, Jeff agreed in principle, Red Hat owns them and I know
no reason they can't be contributed under the GPL v2 or later.

Requires: ethtool change

Several ethernet drivers have been broken by the ethtool support because
the ioctl code used to power the interface up and down as needed. Rather
than add this to each driver call Jeff Garzik suggested we add hooks
for before/after ethtool processing.

This patch implements them which makes fixing the PM stuff easier,
as the epic100 patch to follow will show. It also cleans up the
via-velocity driver pm/ethtool logic a great deal. As per Jeff's
request the before handler is allowed to fail the operation.

--

The contribution herein included is a creation of Red Hat Inc. It is hereby
submitted under the license of the existing files and as a derivative work
thereof. I know of no reason for not having the right to submit the
work herein included.

(Bluff your way in legalese ;))

into hostme.bitkeeper.com:/repos/l/linux-mtd/sbc8260-2.6

Adrian Bunk noticed that the tda1004x DVB frontend driver was broken and
sent a small patch that at least made the driver work again.

There was a discussion afterwards about the kernel syscall interface,
but at the end, the tda1004x DVB frontend driver is still non-functional.

This re-applies the temporary band-aid.

The paca struct contains a pointer to the current task, which is used
for the `current' macro.  For some reason, this field is a u64, and
every time we use it we need a cast, because it is really a pointer.
This patch cleans things up a little by making it a pointer to struct
task_struct and removing the casts.  It also removes a now-incorrect
comment which said that r13 contains current (it now holds
&paca[smp_processor_id()]).
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Occasionally the ppc64 kernel emulates a usermode instruction, for
example in the alignment exception handler.  Kumar Gala pointed out
(in the context of the ppc32 kernel) that if the instruction was being
single-stepped, and we end up emulating the instruction, we should
then send the process a SIGTRAP as if it had not been emulated and the
process had then taken a single-step exception.  This patch implements
this for ppc64.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

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

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

proc_resetdevice is called with dev->serialize held.
usb_reset_device takes dev->serialize and then calls
__usb_reset_device.  To avoid deadlock, proc_resetdevice
should call __usb_reset_device directly.
Signed-off-by: Duncan Sands <baldrick@free.fr>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Updates i386 defconfig.  I simply ran `make oldconfig' and selected `m' where
it was available, otherwise `y'.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Forgot to update the top-level makefile to invoke the new reference_init
script.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The attached patch enables the pwc driver included with kernel 2.6.7-rc2

It also removes the warnings during compilation.
However, note that I blindly duplicated the release approach used by
other usb camera drivers, replacing the current no-op.

The driver works for me with a Logitech QuickCam Notebook Pro and
GnomeMeeting.
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>