1. 13 Dec, 2014 37 commits
  2. 12 Dec, 2014 3 commits
    • Linus Torvalds's avatar
      Merge tag 'please-pull-morepstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · 6ce4436c
      Linus Torvalds authored
      Pull pstore update #2 from Tony Luck:
       "Couple of pstore-ram enhancements to allow use of different memory
      * tag 'please-pull-morepstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        pstore-ram: Allow optional mapping with pgprot_noncached
        pstore-ram: Fix hangs by using write-combine mappings
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · bdeb03ca
      Linus Torvalds authored
      Pull btrfs update from Chris Mason:
       "From a feature point of view, most of the code here comes from Miao
        Xie and others at Fujitsu to implement scrubbing and replacing devices
        on raid56.  This has been in development for a while, and it's a big
        Filipe and Josef have a great assortment of fixes, many of which solve
        problems corruptions either after a crash or in error conditions.  I
        still have a round two from Filipe for next week that solves
        corruptions with discard and block group removal"
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (62 commits)
        Btrfs: make get_caching_control unconditionally return the ctl
        Btrfs: fix unprotected deletion from pending_chunks list
        Btrfs: fix fs mapping extent map leak
        Btrfs: fix memory leak after block remove + trimming
        Btrfs: make btrfs_abort_transaction consider existence of new block groups
        Btrfs: fix race between writing free space cache and trimming
        Btrfs: fix race between fs trimming and block group remove/allocation
        Btrfs, replace: enable dev-replace for raid56
        Btrfs: fix freeing used extents after removing empty block group
        Btrfs: fix crash caused by block group removal
        Btrfs: fix invalid block group rbtree access after bg is removed
        Btrfs, raid56: fix use-after-free problem in the final device replace procedure on raid56
        Btrfs, replace: write raid56 parity into the replace target device
        Btrfs, replace: write dirty pages into the replace target device
        Btrfs, raid56: support parity scrub on raid56
        Btrfs, raid56: use a variant to record the operation type
        Btrfs, scrub: repair the common data on RAID5/6 if it is corrupted
        Btrfs, raid56: don't change bbio and raid_map
        Btrfs: remove unnecessary code of stripe_index assignment in __btrfs_map_block
        Btrfs: remove noused bbio_ret in __btrfs_map_block in condition
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 0349678c
      Linus Torvalds authored
      Pull HID updates from Jiri Kosina:
       - i2c-hid race condition fix from Jean-Baptiste Maneyrol
       - Logitech driver now supports vendor-specific HID++ protocol, allowing
         us to deliver a full multitouch support on wider range of Logitech
         touchpads.  Written by Benjamin Tissoires
       - MS Surface Pro 3 Type Cover support added by Alan Wu
       - RMI touchpad support improvements from Andrew Duggan
       - a lot of updates to Wacom driver from Jason Gerecke and Ping Cheng
       - various small fixes all over the place
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (56 commits)
        HID: rmi: The address of query8 must be calculated based on which query registers are present
        HID: rmi: Check for additional ACM registers appended to F11 data report
        HID: i2c-hid: prevent buffer overflow in early IRQ
        HID: logitech-hidpp: disable io in probe error path
        HID: logitech-hidpp: add boundary check for name retrieval
        HID: logitech-hidpp: check name retrieval return code
        HID: logitech-hidpp: do not return the name length
        HID: wacom: Report input events for each finger on generic devices
        HID: wacom: Initialize MT slots for generic devices at post_parse_hid
        HID: wacom: Update maximum X/Y accounding to outbound offset
        HID: wacom: Add support for DTU-1031X
        HID: wacom: add defines for new Cintiq and DTU outbound tracking
        HID: wacom: fix freeze on open when autosuspend is on
        HID: wacom: re-add accidentally dropped Lenovo PID
        HID: make hid_report_len as a static inline function in hid.h
        HID: wacom: Consult the application usage when determining field type
        HID: wacom: PAD is independent with pen/touch
        HID: multitouch: Add quirk for VTL touch panels
        HID: i2c-hid: fix race condition reading reports
        HID: wacom: Add angular resolution data to some ABS axes