22 Feb, 2011

1 commit


21 Feb, 2011

2 commits

  • * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
    hwmon: (lm85) extend to support EMC6D103 chips
    MAINTAINERS: Remove stale hwmon quilt tree
    hwmon: (k10temp) add support for AMD Family 12h/14h CPUs
    hwmon: (jc42) do not allow writing to locked registers
    hwmon: (jc42) more helpful documentation
    hwmon: (jc42) fix type mismatch

    Linus Torvalds
     
  • This reverts commit 9b29050f8f75916f974a2d231ae5d3cd59792296.

    It has caused hibernate regressions, for example Juri Sladby's report:

    "I'm unable to hibernate 2.6.37.1 unless I rmmod tpm_tis:
    [10974.074587] Suspending console(s) (use no_console_suspend to debug)
    [10974.103073] tpm_tis 00:0c: Operation Timed out
    [10974.103089] legacy_suspend(): pnp_bus_suspend+0x0/0xa0 returns -62
    [10974.103095] PM: Device 00:0c failed to freeze: error -62"

    and Rafael points out that some of the new conditionals in that commit
    seem to make no sense. This commit needs more work and testing, let's
    revert it for now.

    Reported-by: Norbert Preining
    Reported-and-requested-by: Jiri Slaby
    Cc: Stefan Berger
    Cc: Guillaume Chazarain
    Cc: Rajiv Andrade
    Acked-by: Rafael J. Wysocki
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     

19 Feb, 2011

5 commits

  • The interface is identical EMC6D102, so all that needs to be added are
    some definitions and their uses.

    Registers apparently missing in EMC6D103S/EMC6D103:A2 compared to EMC6D103:A0,
    EMC6D103:A1, and EMC6D102 (according to the data sheets), but used
    unconditionally in the driver: 62[5:7], 6D[0:7], and 6E[0:7]. For that
    reason, EMC6D103S chips don't get enabled for the time being.

    Signed-off-by: Jan Beulich
    (Guenter Roeck: Replaced EMC6D103_A2 with EMC6D103S per EMC6D103S datasheet)
    Signed-off-by: Guenter Roeck
    Cc: stable@kernel.org

    Jan Beulich
     
  • * 'rtc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    RTC: Re-enable UIE timer/polling emulation
    RTC: Revert UIE emulation removal
    RTC: Release mutex in error path of rtc_alarm_irq_enable

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (37 commits)
    net: deinit automatic LIST_HEAD
    net: dont leave active on stack LIST_HEAD
    net: provide default_advmss() methods to blackhole dst_ops
    tg3: Restrict phy ioctl access
    drivers/net: Call netif_carrier_off at the end of the probe
    ixgbe: work around for DDP last buffer size
    ixgbe: fix panic due to uninitialised pointer
    e1000e: flush all writebacks before unload
    e1000e: check down flag in tasks
    isdn: hisax: Use l2headersize() instead of dup (and buggy) func.
    arp_notify: unconditionally send gratuitous ARP for NETDEV_NOTIFY_PEERS.
    cxgb4vf: Use defined Mailbox Timeout
    cxgb4vf: Quiesce Virtual Interfaces on shutdown ...
    cxgb4vf: Behave properly when CONFIG_DEBUG_FS isn't defined ...
    cxgb4vf: Check driver parameters in the right place ...
    pch_gbe: Fix the MAC Address load issue.
    iwlwifi: Delete iwl3945_good_plcp_health.
    net/can/softing: make CAN_SOFTING_CS depend on CAN_SOFTING
    netfilter: nf_iterate: fix incorrect RCU usage
    pch_gbe: Fix the issue that the receiving data is not normal.
    ...

    Linus Torvalds
     
  • * 'for-linus/bugfixes' of git://xenbits.xen.org/people/ianc/linux-2.6:
    xen: suspend and resume system devices when running PVHVM

    Linus Torvalds
     
  • * 'fixes-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
    workqueue: make sure MAYDAY_INITIAL_TIMEOUT is at least 2 jiffies long
    workqueue, freezer: unify spelling of 'freeze' + 'able' to 'freezable'
    workqueue: wake up a worker when a rescuer is leaving a gcwq

    Linus Torvalds
     

18 Feb, 2011

10 commits

  • Add the PCI ID to support the internal temperature sensor of the
    AMD "Llano" and "Brazos" processor families.

    Signed-off-by: Clemens Ladisch
    Cc: stable@kernel.org # ca86828: x86, AMD, PCI: Add AMD northbridge PCI device
    Cc: stable@kernel.org
    Signed-off-by: Guenter Roeck

    Clemens Ladisch
     
  • * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
    drm/radeon/kms: add missing frac fb div flag for dce4+
    drm/radeon/kms: do not reject X16 and Y16X16 floating-point formats on r300
    drm/nouveau: fix suspend/resume on GPUs that don't have PM support
    drm/nouveau: flips/flipd need to always set 'evict' for move_accel_cleanup()
    drm/nv40: fix tiling-related setup for a number of chipsets
    drm/nouveau: fix non-EDIDful native mode selection
    drm/nouveau: Fix detection of DDC-based LVDS on DCB15 boards.
    drm/nv04-nv40: Fix NULL dereference when we fail to find an LVDS native mode.
    drm/nv10: Fix crash when allocating a BO larger than half the available VRAM.

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
    IB/qib: Prevent double completions after a timeout or RNR error
    IB/qib: Fix double add_timer()
    RDMA/nes: Don't generate async events for unregistered devices

    Linus Torvalds
     
  • This patch re-enables UIE timer/polling emulation for rtc devices
    that do not support alarm irqs.

    CC: Uwe Kleine-König
    CC: Thomas Gleixner
    Reported-by: Uwe Kleine-König
    Tested-by: Uwe Kleine-König
    Signed-off-by: John Stultz

    John Stultz
     
  • Uwe pointed out that my alarm based UIE emulation is not sufficient
    to replace the older timer/polling based UIE emulation on devices
    where there is no alarm irq. This causes rtc devices without alarms
    to return -EINVAL to UIE ioctls. The fix is to re-instate the old
    timer/polling method for devices without alarm irqs.

    This patch reverts the following commits:
    042620a018afcfba1d678062b62e46 - Remove UIE emulation
    1daeddd5962acad1bea55e524fc0fa - Cleanup removed UIE emulation declaration
    b5cc8ca1c9c3a37eaddf709b2fd3e1 - Remove Kconfig symbol for UIE emulation

    The emulation mode will still need to be wired-in with a following
    patch before it will work.

    CC: Uwe Kleine-König
    CC: Thomas Gleixner
    Reported-by: Uwe Kleine-König
    Signed-off-by: John Stultz

    John Stultz
     
  • On hardware that doesn't support alarm interrupts, rtc_alarm_irq_enable
    could return without releasing the ops_lock mutex.

    This was introduced in
    aa0be0f (RTC: Propagate error handling via rtc_timer_enqueue properly)

    This patch corrects the issue by only returning once the mutex is
    released.

    [john.stultz: Reworded the commit log]

    Signed-off-by: Uwe Kleine-König
    Signed-off-by: John Stultz

    Uwe Kleine-König
     
  • If management firmware is present and the device is down, the firmware
    will assume control of the phy. If a phy access were allowed from the
    host, it will collide with firmware phy accesses, resulting in
    unpredictable behavior. This patch fixes the problem by disallowing phy
    accesses during the problematic condition.

    Signed-off-by: Matt Carlson
    Reviewed-by: Michael Chan
    Signed-off-by: David S. Miller

    Matt Carlson
     
  • Without calling of netif_carrier_off at the end of the probe the operstate
    is unknown when the device is initially opened. By default the carrier is
    on so when the device is opened and netif_carrier_on is called the link
    watch event is not fired and operstate remains zero (unknown).

    This patch fixes this behavior in forcedeth and r8169.

    Signed-off-by: Ivan Vecera
    Acked-by: Francois Romieu
    Signed-off-by: David S. Miller

    Ivan Vecera
     
  • Roland Dreier
     
  • There is a double completion associated with error handling for RC QPs.

    The sequence is:

    - The do_rc_ack() routine fields an RNR nack and there are 0
    rnr_retries configured on the QP.
    - qib_error_qp() stops the pending timer
    - qib_rc_send_complete() is called from sdma_complete()
    - qib_rc_send_complete() starts the timer because the msb of the psn
    just completed says an ack is needed.
    - a bunch of flushes occur as ipoib posts WQEs to an error'ed QP
    - rc_timeout() calls qib_restart_rc()
    - qib_restart_rc() calls qib_send_complete() with a
    IB_WC_RETRY_EXC_ERR on a wqe that has already been completed in the
    past

    The fix avoids starting the timer since another packet will never
    arrive.

    Signed-off-by: Mike Marciniszyn
    Signed-off-by: Roland Dreier

    Mike Marciniszyn
     

17 Feb, 2011

22 commits