21 Jan, 2011

4 commits

  • * 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
    ACPICA: Update version to 20110112
    ACPICA: Update all ACPICA copyrights and signons to 2011
    ACPICA: Fix issues/fault with automatic "serialized" method support
    ACPICA: Debugger: Lock namespace for duration of a namespace dump
    ACPICA: Fix namespace race condition
    ACPICA: Fix memory leak in acpi_ev_asynch_execute_gpe_method().

    Linus Torvalds
     
  • Commit e462c448fdc8 ("pipe: use event aware wakeups") optimized the pipe
    event wakeup calls to avoid wakeups if the events do not match the
    requested set.

    However, the optimization was buggy, in that it didn't actually use the
    correct sets for the events: when we make room for more data to be
    written, the pipe poll() routine will return both the POLLOUT _and_
    POLLWRNORM bits. Similarly for read.

    And most critically, when a pipe is released, that will potentially
    result in POLLHUP|POLLERR (depending on whether it was the last reader
    or writer), not just the regular POLLIN|POLLOUT.

    This bug showed itself as a hung gnome-screensaver-dialog process, stuck
    forever (or at least until it was poked by a signal or by being traced)
    in a poll() system call.

    Cc: Davide Libenzi
    Cc: David S. Miller
    Cc: Eric Dumazet
    Cc: Jens Axboe
    Cc: Andrew Morton
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • During system suspend, the "wait for ring buffer to empty" loop would
    always time out after three seconds, because the faster cached ring
    buffer head read would always return zero. Force the slow-and-careful
    PIO read on all but the first iterations of the loop to fix it.

    This also removes the unused (and useless) 'actual_head' variable that
    tried to approximate doing this, but did it incorrectly.

    Cc: Chris Wilson
    Cc: Rafael J. Wysocki
    Cc: Jesse Barnes
    Cc: Dave Airlie
    Cc: DRI mailing list
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • This partially reverts commit da8aeb92d4853f37e281f11fddf61f9c7d84c3cd
    ("ACPI / Battery: Update information on info notification and resume"),
    which causes a hang on resume on at least some machines.

    This bug was bisected on an ASUS EeePC 901, which hangs at resume time
    if we do that "acpi_battery_refresh(battery)" in the battery resume
    function.

    Rafael suspects we'll still need to refresh the sysfs files upon resume,
    but that that can be done from a PM notifier (that will run after
    thawing user space).

    Bisected-and-tested-by: Linus Torvalds
    Cc: Matthew Garrett
    Cc: Len Brown
    Acked-by: Rafael J. Wysocki
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     

20 Jan, 2011

5 commits

  • …git/tip/linux-2.6-tip

    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86: Unify "numa=" command line option handling
    Revert "x86: Make relocatable kernel work with new binutils"

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (41 commits)
    sctp: user perfect name for Delayed SACK Timer option
    net: fix can_checksum_protocol() arguments swap
    Revert "netlink: test for all flags of the NLM_F_DUMP composite"
    gianfar: Fix misleading indentation in startup_gfar()
    net/irda/sh_irda: return to RX mode when TX error
    net offloading: Do not mask out NETIF_F_HW_VLAN_TX for vlan.
    USB CDC NCM: tx_fixup() race condition fix
    ns83820: Avoid bad pointer deref in ns83820_init_one().
    ipv6: Silence privacy extensions initialization
    bnx2x: Update bnx2x version to 1.62.00-4
    bnx2x: Fix AER setting for BCM57712
    bnx2x: Fix BCM84823 LED behavior
    bnx2x: Mark full duplex on some external PHYs
    bnx2x: Fix BCM8073/BCM8727 microcode loading
    bnx2x: LED fix for BCM8727 over BCM57712
    bnx2x: Common init will be executed only once after POR
    bnx2x: Swap BCM8073 PHY polarity if required
    iwlwifi: fix valid chain reading from EEPROM
    ath5k: fix locking in tx_complete_poll_work
    ath9k_hw: do PA offset calibration only on longcal interval
    ...

    Linus Torvalds
     
  • The option name of Delayed SACK Timer should be SCTP_DELAYED_SACK,
    not SCTP_DELAYED_ACK.

    Left SCTP_DELAYED_ACK be concomitant with SCTP_DELAYED_SACK,
    for making compatibility with existing applications.

    Reference:
    8.1.19. Get or Set Delayed SACK Timer (SCTP_DELAYED_SACK)
    (http://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-25)

    Signed-off-by: Shan Wei
    Acked-by: Wei Yongjun
    Acked-by: Vlad Yasevich
    Signed-off-by: David S. Miller

    Shan Wei
     
  • commit 0363466866d901fbc (net offloading: Convert checksums to use
    centrally computed features.) mistakenly swapped can_checksum_protocol()
    arguments.

    This broke IPv6 on bnx2 for instance, on NIC without TCPv6 checksum
    offloads.

    Reported-by: Hans de Bruin
    Signed-off-by: Eric Dumazet
    Acked-by: Jesse Gross
    Signed-off-by: David S. Miller

    Eric Dumazet
     
  • This reverts commit 0ab03c2b1478f2438d2c80204f7fef65b1bca9cf.

    It breaks several things including the avahi daemon.

    Signed-off-by: David S. Miller

    David S. Miller
     

19 Jan, 2011

31 commits