Skip to content
  1. Oct 04, 2011
  2. Oct 03, 2011
  3. Sep 07, 2011
  4. Aug 24, 2011
  5. Aug 16, 2011
  6. Aug 10, 2011
    • Jiri Kosina's avatar
      HID: add MacBookAir4,2 to hid_have_special_driver[] · f6f554f0
      Jiri Kosina authored
      
      
      Otherwise the generic driver wouldn't unbind from it and wouldn't
      let hid-apple to automatically take over.
      
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      f6f554f0
    • Joshua V. Dillon's avatar
      HID: add support for MacBookAir4,2 keyboard. · 5d922baa
      Joshua V. Dillon authored
      
      
      Added USB device IDs for MacBookAir4,2 keyboard. Device constants were
      copied from the MacBookAir3,2 constants. The 4,2 device specification is
      reportedly unchanged from the 3,2 predecessor and seems to work well.
      
      Signed-off-by: default avatarJoshua V Dillon <jvdillon@gmail.com>
      Signed-off-by: default avatarChase Douglas <chase.douglas@canonical.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      5d922baa
    • Jiri Kosina's avatar
      HID: propagate return value correctly in hid_input_report() · 45dc1ac7
      Jiri Kosina authored
      
      
      Fix a return value propagation that was omitted in David Herrmann's
      locking fix around hid_input_report().
      
      Reported-by: default avatarDavid Herrmann <dh.herrmann@googlemail.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      45dc1ac7
    • David Herrmann's avatar
      HID: Fix race condition between driver core and ll-driver · 4ea54542
      David Herrmann authored
      
      
      HID low level drivers register new devices with the HID core which then
      adds the devices to the HID bus. The HID bus normally immediately probes
      an appropriate driver which then handles HID input for this device.
      The ll driver now uses the hid_input_report() function to report input
      events for a specific device. However, if the HID bus unloads the driver
      at the same time (for instance via a call to
       /sys/bus/hid/devices/<dev>/unbind) then the hdev->driver pointer may be
      used by hid_input_report() and hid_device_remove() at the same time
      which may cause hdev->driver to point to invalid memory.
      
      This fix adds a semaphore to every hid device which protects
      hdev->driver from asynchronous access. This semaphore is locked during
      driver *_probe and *_remove and also inside hid_input_report(). The
      *_probe and *_remove functions may sleep so the semaphore is good here,
      however, hid_input_report() is in atomic context and hence only uses
      down_trylock(). If it cannot acquire the lock it simply drops the input
      package.
      
      The low-level drivers report input events synchronously so
      hid_input_report() should never be entered twice at the same time on the
      same device. Hence, the lock should always be available. But if the
      driver is currently probed/removed then the lock is not available and
      dropping the package should be safe because this is what would have
      happened if the package arrived some milliseconds earlier/later.
      
      This also fixes another race condition while probing drivers:
      First the *_probe function of the driver is called and only if that
      succeeds, the related input device of hidinput is registered. If the low
      level driver reports input events after the *_probe function returned
      but before the input device is registered, then a NULL pointer
      dereference will occur. (Equivalently on driver remove function).
      This is not possible anymore, since the semaphore lock drops all
      incoming packages until the driver/device is fully initialized.
      
      Signed-off-by: default avatarDavid Herrmann <dh.herrmann@googlemail.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      4ea54542
  7. Aug 05, 2011
  8. Jul 24, 2011
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap · f5fc8790
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
        regulator: Convert tps65023 to use regmap API
        regmap: Add SPI bus support
        regmap: Add I2C bus support
        regmap: Add generic non-memory mapped register access API
      f5fc8790
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · d4e06701
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (77 commits)
        [SCSI] fix crash in scsi_dispatch_cmd()
        [SCSI] sr: check_events() ignore GET_EVENT when TUR says otherwise
        [SCSI] bnx2i: Fixed kernel panic due to illegal usage of sc->request->cpu
        [SCSI] bfa: Update the driver version to 3.0.2.1
        [SCSI] bfa: Driver and BSG enhancements.
        [SCSI] bfa: Added support to query PHY.
        [SCSI] bfa: Added HBA diagnostics support.
        [SCSI] bfa: Added support for flash configuration
        [SCSI] bfa: Added support to obtain SFP info.
        [SCSI] bfa: Added support for CEE info and stats query.
        [SCSI] bfa: Extend BSG interface.
        [SCSI] bfa: FCS bug fixes.
        [SCSI] bfa: DMA memory allocation enhancement.
        [SCSI] bfa: Brocade-1860 Fabric Adapter vHBA support.
        [SCSI] bfa: Brocade-1860 Fabric Adapter PLL init fixes.
        [SCSI] bfa: Added Fabric Assigned Address(FAA) support
        [SCSI] bfa: IOC bug fixes.
        [SCSI] bfa: Enable ASIC block configuration and query.
        [SCSI] bnx2i: Updated copyright and bump version
        [SCSI] bnx2i: Modified to skip CNIC registration if iSCSI is not supported
        ...
      
      Fix up some trivial conflicts in:
       - drivers/scsi/bnx2fc/{bnx2fc.h,bnx2fc_fcoe.c}:
      	Crazy broadcom version number conflicts
       - drivers/target/tcm_fc/tfc_cmd.c
      	Just trivial cleanups done on adjacent lines
      d4e06701
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · e4980371
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (297 commits)
        ALSA: asihpi - Replace with snd_ctl_boolean_mono_info()
        ALSA: asihpi - HPI version 4.08
        ALSA: asihpi - Add volume mute controls
        ALSA: asihpi - Control name updates
        ALSA: asihpi - Use size_t for sizeof result
        ALSA: asihpi - Explicitly include mutex.h
        ALSA: asihpi - Add new node and message defines
        ALSA: asihpi - Make local function static
        ALSA: asihpi - Fix minor typos and spelling
        ALSA: asihpi - Remove unused structures, macros and functions
        ALSA: asihpi - Remove spurious adapter index check
        ALSA: asihpi - Revise snd_pcm_debug_name, get rid of DEBUG_NAME macro
        ALSA: asihpi - DSP code loader API now independent of OS
        ALSA: asihpi - Remove controlex structs and associated special data transfer code
        ALSA: asihpi - Increase request and response buffer sizes
        ALSA: asihpi - Give more meaningful name to hpi request message type
        ALSA: usb-audio - Add quirk for  Roland / BOSS BR-800
        ALSA: hda - Remove a superfluous argument of via_auto_init_output()
        ALSA: hda - Fix indep-HP path (de-)activation for VT1708* codecs
        ALSA: hda - Add documentation for codec-specific mixer controls
        ...
      e4980371
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs · 9d1c0213
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
        net/9p: Fix the msize calculation.
        fs/9p: add 9P2000.L unlinkat operation
        fs/9p: add 9P2000.L renameat operation
        fs/9p: Always ask new inode in create
        fs/9p: Clean-up get_protocol_version() to use strcmp
        fs/9p: Fix invalid mount options/args
        fs/9p: When doing inode lookup compare qid details and inode mode bits.
        fs/9p: Fid is not valid after a failed clunk.
        net/9p: Remove structure not used in the code
        VirtIO can transfer VIRTQUEUE_NUM of pages.
        Fix the size of receive buffer packing onto VirtIO ring.
        9p: clean up packet dump code
        fs/9p: remove rename work around in 9p
        net/9p: fix client code to fail more gracefully on protocol error
      9d1c0213
    • Borislav Petkov's avatar
      Documentation: refresh sysctl/kernel.txt · 807094c0
      Borislav Petkov authored
      
      
      Refresh sysctl/kernel.txt.  More specifically,
      
       - drop stale index entries
       - sync and sort index and entries
       - reflow sticking out paragraphs to colwidth 72
       - correct typos
       - cleanup whitespace
      
      Signed-off-by: default avatarBorislav Petkov <bp@alien8.de>
      Signed-off-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      807094c0
    • Wanlong Gao's avatar
      Documentation: fix ambigous text for root cpuset · 9fd615f4
      Wanlong Gao authored
      
      
      Only the root cpuset has cpuset.memory_pressure_enabled flag,
      but not the only one.
      
      Signed-off-by: default avatarWanlong Gao <gaowanlong@cn.fujitsu.com>
      Signed-off-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
      Acked-by: default avatarPaul Menage <menage@google.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      9fd615f4
    • Wanlong Gao's avatar
      Documentation: fix echo command in cgroups/cpuacct.txt · e47f9d84
      Wanlong Gao authored
      
      
      Must echo a task id to the cgroups' tasks file, but not to a directory.
      
      Signed-off-by: default avatarWanlong Gao <gaowanlong@cn.fujitsu.com>
      Acked-by: default avatarPaul Menage <menage@google.com>
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      e47f9d84
    • Linus Torvalds's avatar
      Merge branches 'x86-detect-hyper-for-linus', 'x86-fpu-for-linus',... · b4db920c
      Linus Torvalds authored
      Merge branches 'x86-detect-hyper-for-linus', 'x86-fpu-for-linus', 'x86-kexec-for-linus', 'x86-platform-for-linus', 'x86-quirks-for-linus', 'x86-tsc-for-linus' and 'x86-smpboot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-detect-hyper-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, hyper: Change hypervisor detection order
      
      * 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86-32, fpu: Fix DNA exception during check_fpu()
      
      * 'x86-kexec-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        kexec, x86: Fix incorrect jump back address if not preserving context
      
      * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, config: Introduce an INTEL_MID configuration
      
      * 'x86-quirks-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, quirks: Use pci_dev->revision
      
      * 'x86-tsc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: tsc: Remove unneeded DMI-based blacklisting
      
      * 'x86-smpboot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, boot: Wait for boot cpu to show up if nr_cpus limit is about to hit
      b4db920c
    • Linus Torvalds's avatar
      Merge branch 'x86-build-for-linus' of... · 7080d306
      Linus Torvalds authored
      Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, build: Do not set the root_dev field in bzImage
      7080d306
    • Linus Torvalds's avatar
      Merge branch 'x86-atomic-for-linus' of... · 148a7b17
      Linus Torvalds authored
      Merge branch 'x86-atomic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-atomic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Add support for cmpxchg_double
      148a7b17
    • Linus Torvalds's avatar
      Merge branch 'timers-clocksource-for-linus' of... · 9d071563
      Linus Torvalds authored
      Merge branch 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        clocksource: apb: Share APB timer code with other platforms
      9d071563
    • Linus Torvalds's avatar
      Merge branches 'x86-urgent-for-linus', 'core-debug-for-linus',... · c0c463d3
      Linus Torvalds authored
      Merge branches 'x86-urgent-for-linus', 'core-debug-for-linus', 'irq-core-for-linus' and 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        um: Make rwsem.S depend on CONFIG_RWSEM_XCHGADD_ALGORITHM
      
      * 'core-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        debug: Make CONFIG_EXPERT select CONFIG_DEBUG_KERNEL to unhide debug options
      
      * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        genirq: Remove unused CHECK_IRQ_PER_CPU()
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        perf tools, x86: Fix 32-bit compile on 64-bit system
      c0c463d3
    • James Bottomley's avatar
      Merge branch 'scsi-fixes' · 87045b03
      James Bottomley authored
      87045b03
  9. Jul 23, 2011