1. 13 Dec, 2014 26 commits
  2. 12 Dec, 2014 14 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
        attributes"
      
      * 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
      6ce4436c
    • 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
        improvement.
      
        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
        ...
      bdeb03ca
    • 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
        ...
      0349678c
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · a7cb7bb6
      Linus Torvalds authored
      Pull trivial tree update from Jiri Kosina:
       "Usual stuff: documentation updates, printk() fixes, etc"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (24 commits)
        intel_ips: fix a type in error message
        cpufreq: cpufreq-dt: Move newline to end of error message
        ps3rom: fix error return code
        treewide: fix typo in printk and Kconfig
        ARM: dts: bcm63138: change "interupts" to "interrupts"
        Replace mentions of "list_struct" to "list_head"
        kernel: trace: fix printk message
        scsi: mpt2sas: fix ioctl in comment
        zbud, zswap: change module author email
        clocksource: Fix 'clcoksource' typo in comment
        arm: fix wording of "Crotex" in CONFIG_ARCH_EXYNOS3 help
        gpio: msm-v1: make boolean argument more obvious
        usb: Fix typo in usb-serial-simple.c
        PCI: Fix comment typo 'COMFIG_PM_OPS'
        powerpc: Fix comment typo 'CONIFG_8xx'
        powerpc: Fix comment typos 'CONFiG_ALTIVEC'
        clk: st: Spelling s/stucture/structure/
        isci: Spelling s/stucture/structure/
        usb: gadget: zero: Spelling s/infrastucture/infrastructure/
        treewide: Fix company name in module descriptions
        ...
      a7cb7bb6
    • Linus Torvalds's avatar
      Merge tag 'upstream-3.19-rc1' of git://git.infradead.org/linux-ubifs · ccb5a491
      Linus Torvalds authored
      Pull UBI/UBIFS updates from Artem Bityutskiy:
       "This includes the following UBI/UBIFS changes:
         - UBI debug messages now include the UBI device number.  This change
           is responsible for the big diffstat since it touched every
           debugging print statement.
         - An Xattr bug-fix which fixes SELinux support
         - Several error path fixes in UBI/UBIFS"
      
      * tag 'upstream-3.19-rc1' of git://git.infradead.org/linux-ubifs:
        UBI: Fix invalid vfree()
        UBI: Fix double free after do_sync_erase()
        UBIFS: fix a couple bugs in UBIFS xattr length calculation
        UBI: vtbl: Use ubi_eba_atomic_leb_change()
        UBI: Extend UBI layer debug/messaging capabilities
        UBIFS: fix budget leak in error path
      ccb5a491
    • Linus Torvalds's avatar
      Merge tag 'xfs-for-linus-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs · c05e14f7
      Linus Torvalds authored
      Pull xfs update from Dave Chinner:
       "There's relatively little change in this update; it is mainly bug
        fixes, cleanups and more of the on-going libxfs restructuring and
        on-disk format header consolidation work.
      
        Details:
         - more on-disk format header consolidation
         - move some structures shared with userspace to libxfs
         - new per-mount workqueue to fix for deadlocks between nested loop
           mounted filesystems
         - various bug fixes for ENOSPC, stats, quota off and preallocation
         - a bunch of compiler warning fixes for set-but-unused variables
         - various code cleanups"
      
      * tag 'xfs-for-linus-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs: (24 commits)
        xfs: split metadata and log buffer completion to separate workqueues
        xfs: fix set-but-unused warnings
        xfs: move type conversion functions to xfs_dir.h
        xfs: move ftype conversion functions to libxfs
        xfs: lobotomise xfs_trans_read_buf_map()
        xfs: active inodes stat is broken
        xfs: cleanup xfs_bmse_merge returns
        xfs: cleanup xfs_bmse_shift_one goto mess
        xfs: fix premature enospc on inode allocation
        xfs: overflow in xfs_iomap_eof_align_last_fsb
        xfs: fix simple_return.cocci warning in xfs_bmse_shift_one
        xfs: fix simple_return.cocci warning in xfs_file_readdir
        libxfs: fix simple_return.cocci warnings
        xfs: remove unnecessary null checks
        xfs: merge xfs_inum.h into xfs_format.h
        xfs: move most of xfs_sb.h to xfs_format.h
        xfs: merge xfs_ag.h into xfs_format.h
        xfs: move acl structures to xfs_format.h
        xfs: merge xfs_dinode.h into xfs_format.h
        xfs: catch invalid negative blknos in _xfs_buf_find()
        ...
      c05e14f7
    • Linus Torvalds's avatar
      Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 9bfccec2
      Linus Torvalds authored
      Pull ext4 updates from Ted Ts'o:
       "Lots of bugs fixes, including Zheng and Jan's extent status shrinker
        fixes, which should improve CPU utilization and potential soft lockups
        under heavy memory pressure, and Eric Whitney's bigalloc fixes"
      
      * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (26 commits)
        ext4: ext4_da_convert_inline_data_to_extent drop locked page after error
        ext4: fix suboptimal seek_{data,hole} extents traversial
        ext4: ext4_inline_data_fiemap should respect callers argument
        ext4: prevent fsreentrance deadlock for inline_data
        ext4: forbid journal_async_commit in data=ordered mode
        jbd2: remove unnecessary NULL check before iput()
        ext4: Remove an unnecessary check for NULL before iput()
        ext4: remove unneeded code in ext4_unlink
        ext4: don't count external journal blocks as overhead
        ext4: remove never taken branch from ext4_ext_shift_path_extents()
        ext4: create nojournal_checksum mount option
        ext4: update comments regarding ext4_delete_inode()
        ext4: cleanup GFP flags inside resize path
        ext4: introduce aging to extent status tree
        ext4: cleanup flag definitions for extent status tree
        ext4: limit number of scanned extents in status tree shrinker
        ext4: move handling of list of shrinkable inodes into extent status code
        ext4: change LRU to round-robin in extent status tree shrinker
        ext4: cache extent hole in extent status tree for ext4_da_map_blocks()
        ext4: fix block reservation for bigalloc filesystems
        ...
      9bfccec2
    • Jiri Kosina's avatar
      Merge branches 'for-3.19/hid-report-len', 'for-3.19/i2c-hid',... · 019e129f
      Jiri Kosina authored
      Merge branches 'for-3.19/hid-report-len', 'for-3.19/i2c-hid', 'for-3.19/lenovo', 'for-3.19/logitech', 'for-3.19/microsoft', 'for-3.19/plantronics', 'for-3.19/rmi', 'for-3.19/sony' and 'for-3.19/wacom' into for-linus
      019e129f
    • Andrew Duggan's avatar
      HID: rmi: The address of query8 must be calculated based on which query registers are present · cabd9b5f
      Andrew Duggan authored
      If a touchpad does not report relative data then query 6 will not be present and the address
      of query 8 will be one less. This patches calculates the location of query 8 instead of
      hardcoding the offset.
      Signed-off-by: default avatarAndrew Duggan <aduggan@synaptics.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      cabd9b5f
    • Andrew Duggan's avatar
      HID: rmi: Check for additional ACM registers appended to F11 data report · 8414947a
      Andrew Duggan authored
      If a touchpad reports the F11 data40 register then this indicates that the touchpad reports
      additional ACM (Accidental Contact Mitigation) data after the F11 data in the HID attention
      report. These additional bytes shift the position of the F30 button data causing the driver
      to incorrectly report button state when this functionality is present. This patch accounts
      for the additional data in the report.
      
      Fixes:
      https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1398533Signed-off-by: default avatarAndrew Duggan <aduggan@synaptics.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      8414947a
    • Jiri Kosina's avatar
      Merge branches 'for-3.18/upstream-fixes' and 'for-3.19/upstream' into for-linus · 3ee420ba
      Jiri Kosina authored
      Conflicts:
      	drivers/hid/hid-input.c
      3ee420ba
    • Gwendal Grignou's avatar
      HID: i2c-hid: prevent buffer overflow in early IRQ · d1c7e29e
      Gwendal Grignou authored
      Before ->start() is called, bufsize size is set to HID_MIN_BUFFER_SIZE,
      64 bytes. While processing the IRQ, we were asking to receive up to
      wMaxInputLength bytes, which can be bigger than 64 bytes.
      
      Later, when ->start is run, a proper bufsize will be calculated.
      
      Given wMaxInputLength is said to be unreliable in other part of the
      code, set to receive only what we can even if it results in truncated
      reports.
      Signed-off-by: default avatarGwendal Grignou <gwendal@chromium.org>
      Reviewed-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      d1c7e29e
    • Linus Torvalds's avatar
      Merge branch 'for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · 2756d373
      Linus Torvalds authored
      Pull cgroup update from Tejun Heo:
       "cpuset got simplified a bit.  cgroup core got a fix on unified
        hierarchy and grew some effective css related interfaces which will be
        used for blkio support for writeback IO traffic which is currently
        being worked on"
      
      * 'for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
        cgroup: implement cgroup_get_e_css()
        cgroup: add cgroup_subsys->css_e_css_changed()
        cgroup: add cgroup_subsys->css_released()
        cgroup: fix the async css offline wait logic in cgroup_subtree_control_write()
        cgroup: restructure child_subsys_mask handling in cgroup_subtree_control_write()
        cgroup: separate out cgroup_calc_child_subsys_mask() from cgroup_refresh_child_subsys_mask()
        cpuset: lock vs unlock typo
        cpuset: simplify cpuset_node_allowed API
        cpuset: convert callback_mutex to a spinlock
      2756d373
    • Linus Torvalds's avatar
      Merge branch 'for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata · 4e8790f7
      Linus Torvalds authored
      Pull libata changes from Tejun Heo:
       "The only interesting piece is the support for shingled drives.  The
        changes in libata layer are minimal.  All it does is identifying the
        new class of device and report upwards accordingly"
      
      * 'for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
        libata: Remove FIXME comment in atapi_request_sense()
        sata_rcar: Document deprecated "renesas,rcar-sata"
        sata_rcar: Add clocks to sata_rcar bindings
        ahci_sunxi: Make AHCI_HFLAG_NO_PMP flag configurable with a module option
        libata-scsi: Update SATL for ZAC drives
        libata: Implement ATA_DEV_ZAC
        libsas: use ata_dev_classify()
      4e8790f7