06 May, 2011

2 commits


05 May, 2011

8 commits

  • * 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
    staging: Remove a warning for drivers/staging/wlan-ng/cfg80211.c
    staging: intel_sst: intelmid needs delay.h
    staging: solo6x10: add select SND_PCM to fix build error
    staging: usbip: vhci: fix oops on subsequent attach
    staging: ft1000: Remove unnecessary EXPORT_SYMBOLs
    staging: rts_pstor: use #ifdef instead of #if
    staging: rts_pstor: Add
    staging: gma500: Depend on X86
    staging: olpc: Add

    Linus Torvalds
     
  • * 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
    xHCI: Clear PLC in xhci_bus_resume()
    USB: fix regression in usbip by setting has_tt flag
    usb/isp1760: Report correct urb status after unlink
    omap:usb: add regulator support for EHCI
    mfd: Fix usbhs_enable error handling
    usb: musb: gadget: Fix out-of-sync runtime pm calls
    usb: musb: omap2430: Fix retention idle on musb peripheral only boards

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
    ceph: do not call __mark_dirty_inode under i_lock
    libceph: fix ceph_osdc_alloc_request error checks
    ceph: handle ceph_osdc_new_request failure in ceph_writepages_start
    libceph: fix ceph_msg_new error path
    ceph: use ihold() when i_lock is held

    Linus Torvalds
     
  • * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
    [media] ngene: Fix CI data transfer regression Fix CI data transfer regression introduced by previous cleanup.
    [media] v4l: make sure drivers supply a zeroed struct v4l2_subdev
    [media] Missing frontend config for LME DM04/QQBOX
    [media] rc_core: avoid kernel oops when rmmod saa7134
    [media] imon: add conditional locking in change_protocol
    [media] rc: show RC_TYPE_OTHER in sysfs
    [media] ite-cir: modular build on ppc requires delay.h include
    [media] mceusb: add Dell transceiver ID

    Linus Torvalds
     
  • * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
    firewire: Fix for broken configrom updates in quick succession

    Linus Torvalds
     
  • …s/security-testing-2.6

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
    flex_arrays: allow zero length flex arrays
    flex_array: flex_array_prealloc takes a number of elements, not an end
    SELinux: pass last path component in may_create

    Linus Torvalds
     
  • The SLUB allocator use of the cmpxchg_double logic was wrong: it
    actually needs the irq-safe one.

    That happens automatically when we use the native unlocked 'cmpxchg8b'
    instruction, but when compiling the kernel for older x86 CPUs that do
    not support that instruction, we fall back to the generic emulation
    code.

    And if you don't specify that you want the irq-safe version, the generic
    code ends up just open-coding the cmpxchg8b equivalent without any
    protection against interrupts or preemption. Which definitely doesn't
    work for SLUB.

    This was reported by Werner Landgraf , who saw
    instability with his distro-kernel that was compiled to support pretty
    much everything under the sun. Most big Linux distributions tend to
    compile for PPro and later, and would never have noticed this problem.

    This also fixes the prototypes for the irqsafe cmpxchg_double functions
    to use 'bool' like they should.

    [ Btw, that whole "generic code defaults to no protection" design just
    sounds stupid - if the code needs no protection, there is no reason to
    use "cmpxchg_double" to begin with. So we should probably just remove
    the unprotected version entirely as pointless. - Linus ]

    Signed-off-by: Thomas Gleixner
    Reported-and-tested-by: werner
    Acked-and-tested-by: Ingo Molnar
    Acked-by: Christoph Lameter
    Cc: Pekka Enberg
    Cc: Jens Axboe
    Cc: Tejun Heo
    Link: http://lkml.kernel.org/r/alpine.LFD.2.02.1105041539050.3005@ionos
    Signed-off-by: Ingo Molnar
    Signed-off-by: Linus Torvalds

    Thomas Gleixner
     
  • The __mark_dirty_inode helper now takes i_lock as of 250df6ed. Fix the
    one ceph callers that held i_lock (__ceph_mark_dirty_caps) to return the
    flags value so that the callers can do it outside of i_lock.

    Signed-off-by: Sage Weil

    Sage Weil
     

04 May, 2011

17 commits


03 May, 2011

13 commits

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
    Input: wm831x-ts - move BTN_TOUCH reporting to data transfer
    Input: wm831x-ts - allow IRQ flags to be specified
    Input: wm831x-ts - fix races with IRQ management

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (47 commits)
    sysctl: net: call unregister_net_sysctl_table where needed
    Revert: veth: remove unneeded ifname code from veth_newlink()
    smsc95xx: fix reset check
    tg3: Fix failure to enable WoL by default when possible
    networking: inappropriate ioctl operation should return ENOTTY
    amd8111e: trivial typo spelling: Negotitate -> Negotiate
    ipv4: don't spam dmesg with "Using LC-trie" messages
    af_unix: Only allow recv on connected seqpacket sockets.
    mii: add support of pause frames in mii_get_an
    net: ftmac100: fix scheduling while atomic during PHY link status change
    usbnet: Transfer of maintainership
    usbnet: add support for some Huawei modems with cdc-ether ports
    bnx2: cancel timer on device removal
    iwl4965: fix "Received BA when not expected"
    iwlagn: fix "Received BA when not expected"
    dsa/mv88e6131: fix unknown multicast/broadcast forwarding on mv88e6085
    usbnet: Resubmit interrupt URB if device is open
    iwl4965: fix "TX Power requested while scanning"
    iwlegacy: led stay solid on when no traffic
    b43: trivial: update module info about ucode16_mimo firmware
    ...

    Linus Torvalds
     
  • This patch (as1460) fixes a regression in the usbip driver caused by
    the new check for Transaction Translators in USB-2 hubs. The root hub
    registered by vhci_hcd needs to have the has_tt flag set, because it
    can connect to low- and full-speed devices as well as high-speed
    devices.

    Signed-off-by: Alan Stern
    Reported-and-tested-by: Nikola Ciprich
    CC:
    Signed-off-by: Greg Kroah-Hartman

    Alan Stern
     
  • This fixes a bug in my previous (2.6.38) patch series which caused
    urb->status value to be wrong after unlink (broke usbtest 11, 12).

    Signed-off-by: Arvid Brodin
    Signed-off-by: Greg Kroah-Hartman

    Arvid Brodin
     
  • ctl_table_headers registered with register_net_sysctl_table should
    have been unregistered with the equivalent unregister_net_sysctl_table

    Signed-off-by: Lucian Adrian Grijincu
    Signed-off-by: David S. Miller

    Lucian Adrian Grijincu
     
  • 84c49d8c3e4abefb0a41a77b25aa37ebe8d6b743 ("veth: remove unneeded
    ifname code from veth_newlink()") caused regression on veth
    creation. This patch reverts the original one.

    Reported-by: Michał Mirosław
    Signed-off-by: Jiri Pirko
    Signed-off-by: David S. Miller

    Jiri Pirko
     
  • The reset loop check should check the MII_BMCR register value for
    BMCR_RESET rather than for MII_BMCR (the register address, which also
    happens to be zero).

    Signed-off-by: Rabin Vincent
    Signed-off-by: David S. Miller

    Rabin Vincent
     
  • tg3 is supposed to enable WoL by default on adapters which support
    that, but it fails to do so unless the adapter's
    /sys/devices/.../power/wakeup file contains 'enabled' during the
    initialization of the adapter. Fix that by making tg3 use
    device_set_wakeup_enable() to enable wakeup automatically whenever
    WoL should be enabled by default.

    Signed-off-by: Rafael J. Wysocki
    Signed-off-by: David S. Miller

    Rafael J. Wysocki
     
  • ioctl() calls against a socket with an inappropriate ioctl operation
    are incorrectly returning EINVAL rather than ENOTTY:

    [ENOTTY]
    Inappropriate I/O control operation.

    BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=33992

    Signed-off-by: Lifeng Sun
    Signed-off-by: David S. Miller

    Lifeng Sun
     
  • The use of base for %ebx in this file is arbitrary, *except* that we
    also use it to compute the real-mode segment. Therefore, make it so
    that r_base really is the true address to which %ebx points.

    This resolves kernel bugzilla 33302.

    Reported-and-tested-by: Alexey Zaytsev
    Signed-off-by: H. Peter Anvin
    Link: http://lkml.kernel.org/n/tip-08os5wi3yq1no0y4i5m4z7he@git.kernel.org

    H. Peter Anvin
     
  • Signed-off-by: Joe Perches
    Signed-off-by: David S. Miller

    Joe Perches
     
  • Current implementation of ohci_set_config_rom() uses a deferred
    bus reset via fw_schedule_bus_reset(). If clients add multiple
    unit descriptors to the config_rom in quick succession, the
    deferred bus reset may not have fired before succeeding update
    requests have come in. This can lead to an incorrect partial
    update of the config_rom for both addition and removal of
    config_rom descriptors, as the ohci_set_config_rom() routine
    will return -EBUSY if a previous pending update has not been
    completed yet; the requested update just gets dropped on the floor.

    This patch recognizes that the "in-flight" update can be modified
    until it has been processed by the bus-reset, and the locking
    in the bus_reset_tasklet ensures that the update is done atomically
    with respect to modifications made by ohci_set_config_rom(). The
    -EBUSY error case is simply removed.

    [Stefan R: The bug always existed at least theoretically. But it
    became easy to trigger since 2.6.36 commit 02d37bed188c "firewire: core:
    integrate software-forced bus resets with bus management" which
    introduced long mandatory delays between janitorial bus resets.]

    Signed-off-by: Benjamin Buchalter
    Signed-off-by: Stefan Richter (trivial style changes)
    Cc: # 2.6.36.y and newer

    B.J. Buchalter
     
  • mask_rw_pte is currently checking if a pfn is a pagetable page if it
    falls in the range pgt_buf_start - pgt_buf_end but that is incorrect
    because pgt_buf_end is a moving target: pgt_buf_top is the real
    boundary.

    Acked-by: "H. Peter Anvin"
    Signed-off-by: Stefano Stabellini
    Signed-off-by: Konrad Rzeszutek Wilk

    Stefano Stabellini