01 May, 2009

8 commits


30 Apr, 2009

23 commits


29 Apr, 2009

9 commits

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (24 commits)
    e100: do not go D3 in shutdown unless system is powering off
    netfilter: revised locking for x_tables
    Bluetooth: Fix connection establishment with low security requirement
    Bluetooth: Add different pairing timeout for Legacy Pairing
    Bluetooth: Ensure that HCI sysfs add/del is preempt safe
    net: Avoid extra wakeups of threads blocked in wait_for_packet()
    net: Fix typo in net_device_ops description.
    ipv4: Limit size of route cache hash table
    Add reference to CAPI 2.0 standard
    Documentation/isdn/INTERFACE.CAPI
    update Documentation/isdn/00-INDEX
    ixgbe: Fix WoL functionality for 82599 KX4 devices
    veth: prevent oops caused by netdev destructor
    xfrm: wrong hash value for temporary SA
    forcedeth: tx timeout fix
    net: Fix LL_MAX_HEADER for CONFIG_TR_MODULE
    mlx4_en: Handle page allocation failure during receive
    mlx4_en: Fix cleanup flow on cq activation
    vlan: update vlan carrier state for admin up/down
    netfilter: xt_recent: fix stack overread in compat code
    ...

    Linus Torvalds
     
  • After experimenting with kexec with the last merges after 2.6.29, I've
    had some problems when probing e100. It would not read the eeprom. After
    some bisects, I realized this has been like that since forever (at least
    2.6.18). The problem is that shutdown is doing the same thing that
    suspend does and puts the device in D3 state. I couldn't find a way to
    get the device back to a sane state in the probe function. So, based on
    some similar patches from Rafael J. Wysocki for e1000, e1000e, and ixgbe,
    I wrote this one for e100.

    Signed-off-by: Thadeu Lima de Souza Cascardo
    Acked-by: "Rafael J. Wysocki"
    Signed-off-by: Jeff Kirsher
    Signed-off-by: David S. Miller

    Thadeu Lima de Souza Cascardo
     
  • David S. Miller
     
  • The x_tables are organized with a table structure and a per-cpu copies
    of the counters and rules. On older kernels there was a reader/writer
    lock per table which was a performance bottleneck. In 2.6.30-rc, this
    was converted to use RCU and the counters/rules which solved the performance
    problems for do_table but made replacing rules much slower because of
    the necessary RCU grace period.

    This version uses a per-cpu set of spinlocks and counters to allow to
    table processing to proceed without the cache thrashing of a global
    reader lock and keeps the same performance for table updates.

    Signed-off-by: Stephen Hemminger
    Acked-by: Linus Torvalds
    Signed-off-by: David S. Miller

    Stephen Hemminger
     
  • * 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:
    drm/i915: fix up error path leak in i915_cmdbuffer
    drm/i915: fix unpaired i915 device mutex on entervt failure.
    drm/i915: add support for G41 chipset
    drm/i915: Enable ASLE if present
    drm/i915: Unregister ACPI video driver when exiting
    drm/i915: Register ACPI video even when not modesetting
    drm/i915: fix transition to I915_TILING_NONE
    drm/i915: Don't let an oops get triggered from irq_emit without dma init.
    drm/i915: allow tiled front buffers on 965+

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (21 commits)
    RDMA/nes: Update iw_nes version
    RDMA/nes: Fix error path in nes_accept()
    RDMA/nes: Fix hang issues for large cluster dynamic connections
    RDMA/nes: Increase rexmit timeout interval
    RDMA/nes: Check for sequence number wrap-around
    RDMA/nes: Do not set apbvt entry for loopback
    RDMA/nes: Fix unused variable compile warning when INFINIBAND_NES_DEBUG=n
    RDMA/nes: Fix fw_ver in /sys
    RDMA/nes: Set trace length to 1 inch for SFP_D
    RDMA/nes: Enable repause timer for port 1
    RDMA/nes: Correct CDR loop filter setting for port 1
    RDMA/nes: Modify thermo mitigation to flip SerDes1 ref clk to internal
    RDMA/nes: Fix resource issues in nes_create_cq() and nes_destroy_cq()
    RDMA/nes: Remove root_256()'s unused pbl_count_256 parameter
    mlx4_core: Fix memory leak in mlx4_enable_msi_x()
    IB/mthca: Fix timeout for INIT_HCA and a few other commands
    RDMA/cxgb3: Don't zero QP attrs when moving to IDLE
    RDMA/nes: Fix bugs in nes_reg_phys_mr()
    RDMA/nes: Fix compiler warning at nes_verbs.c:1955
    IPoIB: Disable NAPI while CQ is being drained
    ...

    Linus Torvalds
     
  • Fix this:

    arch/m68k/kernel/sun3-head.S: Assembler messages:
    arch/m68k/kernel/sun3-head.S:32: Error: Unknown operator -- statement `__head' ignored

    Introduced by commit 6f335cab0431d5df4995bcd4fd952d4c746d5a86 ("m68k:
    convert to use __HEAD and HEAD_TEXT macros."), which started using
    __HEAD without adding the appropriate include.

    Signed-off-by: Geert Uytterhoeven
    Signed-off-by: Linus Torvalds

    Geert Uytterhoeven
     
  • * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
    bio: fix memcpy corruption in bio_copy_user_iov()
    hd: fix locking
    mg_disk: fix CONFIG_LBD=y warning
    mg_disk: fix locking

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
    regulator: Fix default constraints for fixed voltage regulators
    regulator/bq24022: fix bug in is_enabled function
    regulator/virtual: fix strings compare predicates
    regulator core: fix double-free in regulator_register() error path
    drivers/regulator: fix when type is different from REGULATOR_VOLTAGE or REGULATOR_CURRENT
    unreachable code in drms_uA_update()
    regulator: fix header file missing kernel-doc

    Linus Torvalds