commit 69849375d6b13e94d08cdc94b49b11fbab454a0e
Merge: 392eaef... 8806048...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Oct 8 11:41:10 2008 -0700

    Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
    
    * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
      [MIPS] Sibyte: Register PIO PATA device only for Swarm and Litte Sur

commit 392eaef2e9f8e6527043ad8422d9cfea59ee6fb0
Merge: 85ba94b... 9d2c27e...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Oct 8 11:40:19 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      tcp: Fix tcp_hybla zero congestion window growth with small rho and large cwnd.
      net: Fix netdev_run_todo dead-lock
      tcp: Fix possible double-ack w/ user dma
      net: only invoke dev->change_rx_flags when device is UP
      netrom: Fix sock_orphan() use in nr_release
      ax25: Quick fix for making sure unaccepted sockets get destroyed.
      Revert "ax25: Fix std timer socket destroy handling."
      [Bluetooth] Add reset quirk for A-Link BlueUSB21 dongle
      [Bluetooth] Add reset quirk for new Targus and Belkin dongles
      [Bluetooth] Fix double frees on error paths of btusb and bpa10x drivers

commit 8806048878fce541afe1d72cd2320f092519f90a
Author: Ralf Baechle <ralf@linux-mips.org>
Date:   Wed Oct 8 19:14:33 2008 +0100

    [MIPS] Sibyte: Register PIO PATA device only for Swarm and Litte Sur
    
    Symbol name spaghetti which is too complicated to cleanup on this stage
    of the release cycle breaks the build on BCM1480 platforms.
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 9d2c27e17b7574023b5adb5c6a50d7aaeb915543
Author: Daniele Lacamera <root@danielinux.net>
Date:   Tue Oct 7 15:58:17 2008 -0700

    tcp: Fix tcp_hybla zero congestion window growth with small rho and large cwnd.
    
    Because of rounding, in certain conditions, i.e. when in congestion
    avoidance state rho is smaller than 1/128 of the current cwnd, TCP
    Hybla congestion control starves and the cwnd is kept constant
    forever.
    
    This patch forces an increment by one segment after #send_cwnd calls
    without increments(newreno behavior).
    
    Signed-off-by: Daniele Lacamera <root@danielinux.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 58ec3b4db9eb5a28e3aec5f407a54e28f7039c19
Author: Herbert Xu <herbert@gondor.apana.org.au>
Date:   Tue Oct 7 15:50:03 2008 -0700

    net: Fix netdev_run_todo dead-lock
    
    Benjamin Thery tracked down a bug that explains many instances
    of the error
    
    unregister_netdevice: waiting for %s to become free. Usage count = %d
    
    It turns out that netdev_run_todo can dead-lock with itself if
    a second instance of it is run in a thread that will then free
    a reference to the device waited on by the first instance.
    
    The problem is really quite silly.  We were trying to create
    parallelism where none was required.  As netdev_run_todo always
    follows a RTNL section, and that todo tasks can only be added
    with the RTNL held, by definition you should only need to wait
    for the very ones that you've added and be done with it.
    
    There is no need for a second mutex or spinlock.
    
    This is exactly what the following patch does.
    
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 742201e7baf66c64995fdd033d706220e6208fab
Merge: 53240c2... 1305e9e...
Author: David S. Miller <davem@davemloft.net>
Date:   Tue Oct 7 15:32:20 2008 -0700

    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6

commit 53240c208776d557dba9d7afedbcdbf512774c16
Author: Ali Saidi <saidi@engin.umich.edu>
Date:   Tue Oct 7 15:31:19 2008 -0700

    tcp: Fix possible double-ack w/ user dma
    
    From: Ali Saidi <saidi@engin.umich.edu>
    
    When TCP receive copy offload is enabled it's possible that
    tcp_rcv_established() will cause two acks to be sent for a single
    packet. In the case that a tcp_dma_early_copy() is successful,
    copied_early is set to true which causes tcp_cleanup_rbuf() to be
    called early which can send an ack. Further along in
    tcp_rcv_established(), __tcp_ack_snd_check() is called and will
    schedule a delayed ACK. If no packets are processed before the delayed
    ack timer expires the packet will be acked twice.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit b6c40d68ff6498b7f63ddf97cf0aa818d748dee7
Author: Patrick McHardy <kaber@trash.net>
Date:   Tue Oct 7 15:26:48 2008 -0700

    net: only invoke dev->change_rx_flags when device is UP
    
    Jesper Dangaard Brouer <hawk@comx.dk> reported a bug when setting a VLAN
    device down that is in promiscous mode:
    
    When the VLAN device is set down, the promiscous count on the real
    device is decremented by one by vlan_dev_stop(). When removing the
    promiscous flag from the VLAN device afterwards, the promiscous
    count on the real device is decremented a second time by the
    vlan_change_rx_flags() callback.
    
    The root cause for this is that the ->change_rx_flags() callback is
    invoked while the device is down. The synchronization is meant to mirror
    the behaviour of the ->set_rx_mode callbacks, meaning the ->open function
    is responsible for doing a full sync on open, the ->close() function is
    responsible for doing full cleanup on ->stop() and ->change_rx_flags()
    is meant to do incremental changes while the device is UP.
    
    Only invoke ->change_rx_flags() while the device is UP to provide the
    intended behaviour.
    
    Tested-by: Jesper Dangaard Brouer <jdb@comx.dk>
    
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 85ba94ba0592296053f7f2846812173424afe1cb
Author: Matt Mackall <mpm@selenic.com>
Date:   Tue Oct 7 11:37:35 2008 -0500

    SLOB: fix bogus ksize calculation
    
    SLOB's ksize calculation was braindamaged and generally harmlessly
    underreported the allocation size. But for very small buffers, it could
    in fact overreport them, leading code depending on krealloc to overrun
    the allocation and trample other data.
    
    Signed-off-by: Matt Mackall <mpm@selenic.com>
    Tested-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit e09e6e2b6a5daf653794926ab50a784b14b6de53
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Oct 7 07:54:34 2008 -0700

    Revert "V4L/DVB (8904): cx88: add missing unlock_kernel"
    
    This reverts commit 135aedc38e812b922aa56096f36a3d72ffbcf2fb, as
    requested by Hans Verkuil.
    
    It was a patch for 2.6.28 where the BKL was pushed down from v4l core to
    the drivers, not for 2.6.27!
    
    Requested-by: Hans Verkuil <hverkuil@xs4all.nl>
    Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
    Signed-of-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 859f4c74d8de4dc344b3a115367d5e22a79bddaf
Author: Jarek Poplawski <jarkao2@gmail.com>
Date:   Mon Oct 6 12:54:57 2008 -0700

    netrom: Fix sock_orphan() use in nr_release
    
    While debugging another bug it was found that NetRom socks
    are sometimes seen unorphaned in sk_free(). This patch moves
    sock_orphan() in nr_release() to the beginning (like in ax25,
    or rose).
    
    Reported-and-tested-by: Bernard Pidoux f6bvp <f6bvp@free.fr>
    Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 33d1d2c52c3befa6c4df33b4ba58137d1c48894b
Author: David S. Miller <davem@davemloft.net>
Date:   Mon Oct 6 12:53:50 2008 -0700

    ax25: Quick fix for making sure unaccepted sockets get destroyed.
    
    Since we reverted 30902dc3cb0ea1cfc7ac2b17bcf478ff98420d74 ("ax25: Fix
    std timer socket destroy handling.") we have to put some kind of fix
    in to cure the issue whereby unaccepted connections do not get destroyed.
    
    The approach used here is from Tihomir Heidelberg - 9a4gl
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 88a944eef8a4f9a2ca647eb16202a2b63f8ba7cd
Author: David S. Miller <davem@davemloft.net>
Date:   Mon Oct 6 12:48:29 2008 -0700

    Revert "ax25: Fix std timer socket destroy handling."
    
    This reverts commit 30902dc3cb0ea1cfc7ac2b17bcf478ff98420d74.
    
    It causes all kinds of problems, based upon a report by
    Bernard (f6bvp) and analysis by Jarek Poplawski.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 1305e9e7991d6c6b6aaa6e45f3f87363e6a66604
Author: Marcel Holtmann <marcel@holtmann.org>
Date:   Mon Oct 6 12:22:52 2008 +0200

    [Bluetooth] Add reset quirk for A-Link BlueUSB21 dongle
    
    The new A-Link Bluetooth dongle is another one based on the BCM2046 chip
    from Broadcom and it also needs to send HCI_Reset before it becomes fully
    operational. Without the quirk it will show a lot of I/O errors.
    
    Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

commit 4f62f6cb93a58f77056daed73a7700fe467f7eb3
Author: Marcel Holtmann <marcel@holtmann.org>
Date:   Mon Oct 6 12:22:51 2008 +0200

    [Bluetooth] Add reset quirk for new Targus and Belkin dongles
    
    Targus and Belkin have come out with new Bluetooth 2.1 capable dongles
    using the latest BCM2046 chip from Broadcom. Both of them are so called
    HID proxy dongles and they need to send HCI_Reset before they become
    fully operational.
    
    Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

commit 36010ff6788a058147ae15a1aebf97fd30fa51a9
Author: Marcel Holtmann <marcel@holtmann.org>
Date:   Mon Oct 6 12:22:51 2008 +0200

    [Bluetooth] Fix double frees on error paths of btusb and bpa10x drivers
    
    The transfer buffer of an URB will be automatically freed when using
    the URB_FREE_BUFFER transfer_flag. So the extra calls to kfree() will
    cause a double free.
    
    Reported-by: Justin Mattock <justinmattock@gmail.com>
    Signed-off-by: Rabin Vincent <rabin@rab.in>
    Signed-off-by: Marcel Holtmann <marcel@holtmann.org>