1. 11 5月, 2013 7 次提交
    • L
      Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86 · a77c0058
      Linus Torvalds 提交于
      Pull x86 platform drivers from Matthew Garrett:
       "Small set of updates, mainly trivial bugfixes and some small updates
        to deal with newer hardware.
      
        There's also a new driver that allows qemu guests to notify the
        hypervisor that they've just paniced, which seems useful."
      
      * 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86:
        Add support for fan button on Ideapad Z580
        pvpanic: pvpanic device driver
        asus-nb-wmi: set wapf=4 for ASUSTeK COMPUTER INC. X75A
        drivers: platform: x86: Use PTR_RET function
        sony-laptop: SVS151290S kbd backlight and gfx switch support
        hp-wmi: add more definitions for new event_id's
        dell-laptop: Fix krealloc() misuse in parse_da_table()
        hp_accel: Ignore the error from lis3lv02d_poweron() at resume
        dell: add new dell WMI format for the AIO machines
      a77c0058
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal · 3644bc2e
      Linus Torvalds 提交于
      Pull stray syscall bits from Al Viro:
       "Several syscall-related commits that were missing from the original"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal:
        switch compat_sys_sysctl to COMPAT_SYSCALL_DEFINE
        unicore32: just use mmap_pgoff()...
        unify compat fanotify_mark(2), switch to COMPAT_SYSCALL_DEFINE
        x86, vm86: fix VM86 syscalls: use SYSCALL_DEFINEx(...)
      3644bc2e
    • L
      Merge tag 'ecryptfs-3.10-rc1-ablkcipher' of... · 6fad8d02
      Linus Torvalds 提交于
      Merge tag 'ecryptfs-3.10-rc1-ablkcipher' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs
      
      Pull eCryptfs update from Tyler Hicks:
       "Improve performance when AES-NI (and most likely other crypto
        accelerators) is available by moving to the ablkcipher crypto API.
        The improvement is more apparent on faster storage devices.
      
        There's no noticeable change when hardware crypto is not available"
      
      * tag 'ecryptfs-3.10-rc1-ablkcipher' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
        eCryptfs: Use the ablkcipher crypto API
      6fad8d02
    • L
      Merge tag 'for-linus-20130509' of git://git.infradead.org/~dwmw2/random-2.6 · f741df1f
      Linus Torvalds 提交于
      Pull misc fixes from David Woodhouse:
       "This is some miscellaneous cleanups that don't really belong anywhere
        else (or were ignored), that have been sitting in linux-next for some
        time.  Two of them are fixes resulting from my audit of krealloc()
        usage that don't seem to have elicited any response when I posted
        them, and the other three are patches from Artem removing dead code."
      
      * tag 'for-linus-20130509' of git://git.infradead.org/~dwmw2/random-2.6:
        pcmcia: remove RPX board stuff
        m68k: remove rpxlite stuff
        pcmcia: remove Motorola MBX860 support
        params: Fix potential memory leak in add_sysfs_param()
        dell-laptop: Fix krealloc() misuse in parse_da_table()
      f741df1f
    • L
      Merge tag 'kvm-3.10-2' of git://git.kernel.org/pub/scm/virt/kvm/kvm · c67723eb
      Linus Torvalds 提交于
      Pull kvm fixes from Gleb Natapov:
       "Most of the fixes are in the emulator since now we emulate more than
        we did before for correctness sake we see more bugs there, but there
        is also an OOPS fixed and corruption of xcr0 register."
      
      * tag 'kvm-3.10-2' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
        KVM: emulator: emulate SALC
        KVM: emulator: emulate XLAT
        KVM: emulator: emulate AAM
        KVM: VMX: fix halt emulation while emulating invalid guest sate
        KVM: Fix kvm_irqfd_init initialization
        KVM: x86: fix maintenance of guest/host xcr0 state
      c67723eb
    • L
      Merge tag 'dm-3.10-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm · ec667158
      Linus Torvalds 提交于
      Pull device-mapper updates from Alasdair Kergon:
       "Allow devices that hold metadata for the device-mapper thin
        provisioning target to be extended easily; allow WRITE SAME on
        multipath devices; an assortment of little fixes and clean-ups."
      
      * tag 'dm-3.10-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm: (21 commits)
        dm cache: set config value
        dm cache: move config fns
        dm thin: generate event when metadata threshold passed
        dm persistent metadata: add space map threshold callback
        dm persistent data: add threshold callback to space map
        dm thin: detect metadata device resizing
        dm persistent data: support space map resizing
        dm thin: open dev read only when possible
        dm thin: refactor data dev resize
        dm cache: replace memcpy with struct assignment
        dm cache: fix typos in comments
        dm cache policy: fix description of lookup fn
        dm: document iterate_devices
        dm persistent data: fix error message typos
        dm cache: tune migration throttling
        dm mpath: enable WRITE SAME support
        dm table: fix write same support
        dm bufio: avoid a possible __vmalloc deadlock
        dm snapshot: fix error return code in snapshot_ctr
        dm cache: fix error return code in cache_create
        ...
      ec667158
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · f755407d
      Linus Torvalds 提交于
      Pull HID fixes from Jiri Kosina:
      
       - fix usage of sleeping lock in atomic context from Jiri Kosina
      
       - build fix for hid-steelseries under certain .config setups by Simon Wood
      
       - simple mismerge fix from Fernando Luis Vázquez Cao
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
        HID: debug: fix RCU preemption issue
        HID: hid-steelseries fix led class build issue
        HID: reintroduce fix-up for certain Sony RF receivers
      f755407d
  2. 10 5月, 2013 33 次提交