1. 03 9月, 2014 8 次提交
  2. 02 9月, 2014 3 次提交
  3. 25 8月, 2014 15 次提交
  4. 20 8月, 2014 5 次提交
  5. 17 8月, 2014 1 次提交
  6. 16 8月, 2014 8 次提交
    • L
      Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86 · 605f884d
      Linus Torvalds 提交于
      Pull x86 platform driver updates from Matthew Garrett:
       "A moderate number of changes, but nothing awfully significant.
      
        A lot of const cleanups, some reworking and additions to the rfkill
        quirks in the asus driver, a new driver for generating falling laptop
        events on Toshibas and some misc fixes.
      
        Maybe vendors have stopped inventing things"
      
      * 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86: (41 commits)
        platform/x86: Enable build support for toshiba_haps
        Documentation: Add file about toshiba_haps module
        platform/x86: Toshiba HDD Active Protection Sensor
        asus-nb-wmi: Add wapf4 quirk for the U32U
        alienware-wmi: make hdmi_mux enabled on case-by-case basis
        ideapad-laptop: Constify DMI table and other r/o variables
        asus-nb-wmi.c: Rename x401u quirk to wapf4
        compal-laptop: correct invalid hwmon name
        toshiba_acpi: Add Qosmio X75-A to the alt keymap dmi list
        toshiba_acpi: Add extra check to backlight code
        Fix log message about future removal of interface
        ideapad-laptop: Disable touchpad interface on Yoga models
        asus-nb-wmi: Add wapf4 quirk for the X550CC
        intel_ips: Make ips_mcp_limits variables static
        thinkpad_acpi: Mark volume_alsa_control_{vol,mute} as __initdata
        fujitsu-laptop: Mark fujitsu_dmi_table[] DMI table as __initconst
        hp-wmi: Add missing __init annotations to initialization code
        hp_accel: Constify ACPI and DMI tables
        fujitsu-tablet: Mark DMI callbacks as __init code
        dell-laptop: Mark dell_quirks[] DMI table as __initconst
        ...
      605f884d
    • L
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux · 49899007
      Linus Torvalds 提交于
      Pull idle update from Len Brown:
       "Two Intel-platform-specific updates to intel_idle, and a cosmetic
        tweak to the turbostat utility"
      
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
        tools/power turbostat: tweak whitespace in output format
        intel_idle: Broadwell support
        intel_idle: Disable Baytrail Core and Module C6 auto-demotion
      49899007
    • L
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · 6fedb0ff
      Linus Torvalds 提交于
      Pull module fix from Rusty Russell:
       "Nasty potential bug if someone uses a known module param with an
        invalid value (we don't fail unknown module params any more, just
        warn)"
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
        module: Clean up ro/nx after early module load failures
      6fedb0ff
    • L
      Merge branch 'rng-queue' of git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio · 90c80969
      Linus Torvalds 提交于
      Pull virtio-rng update from Amit Shah:
       "Add derating factor for use by hwrng core
      
        Sending directly to you with the commit log changes Ted Ts'o pointed
        out.  Not sure if Rusty's back after his travel, but this already has
        his s-o-b"
      
      * 'rng-queue' of git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio:
        virtio: rng: add derating factor for use by hwrng core
      90c80969
    • L
      Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · e64df3eb
      Linus Torvalds 提交于
      Pull btrfs updates from Chris Mason:
       "These are all fixes I'd like to get out to a broader audience.
      
        The biggest of the bunch is Mark's quota fix, which is also in the
        SUSE kernel, and makes our subvolume quotas dramatically more
        accurate.
      
        I've been running xfstests with these against your current git
        overnight, but I'm queueing up longer tests as well"
      
      * 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        btrfs: disable strict file flushes for renames and truncates
        Btrfs: fix csum tree corruption, duplicate and outdated checksums
        Btrfs: Fix memory corruption by ulist_add_merge() on 32bit arch
        Btrfs: fix compressed write corruption on enospc
        btrfs: correctly handle return from ulist_add
        btrfs: qgroup: account shared subtrees during snapshot delete
        Btrfs: read lock extent buffer while walking backrefs
        Btrfs: __btrfs_mod_ref should always use no_quota
        btrfs: adjust statfs calculations according to raid profiles
      e64df3eb
    • L
      Merge tag 'locks-v3.17-2' of git://git.samba.org/jlayton/linux · 53b95d63
      Linus Torvalds 提交于
      Pull file locking bugfixes from Jeff Layton:
       "Most of these patches are to fix a long-standing regression that crept
        in when the BKL was removed from the file-locking code.  The code was
        converted to use a conventional spinlock, but some fl_release_private
        ops can block and you can end up sleeping inside the lock.
      
        There's also a patch to make /proc/locks show delegations as 'DELEG'"
      
      * tag 'locks-v3.17-2' of git://git.samba.org/jlayton/linux:
        locks: update Locking documentation to clarify fl_release_private behavior
        locks: move locks_free_lock calls in do_fcntl_add_lease outside spinlock
        locks: defer freeing locks in locks_delete_lock until after i_lock has been dropped
        locks: don't reuse file_lock in __posix_lock_file
        locks: don't call locks_release_private from locks_copy_lock
        locks: show delegations as "DELEG" in /proc/locks
      53b95d63
    • L
      Merge git://git.kvack.org/~bcrl/aio-next · da06df54
      Linus Torvalds 提交于
      Pull aio updates from Ben LaHaise.
      
      * git://git.kvack.org/~bcrl/aio-next:
        aio: use iovec array rather than the single one
        aio: fix some comments
        aio: use the macro rather than the inline magic number
        aio: remove the needless registration of ring file's private_data
        aio: remove no longer needed preempt_disable()
        aio: kill the misleading rcu read locks in ioctx_add_table() and kill_ioctx()
        aio: change exit_aio() to load mm->ioctx_table once and avoid rcu_read_lock()
      da06df54
    • A
      platform/x86: Enable build support for toshiba_haps · 186e4e89
      Azael Avalos 提交于
      Makefile and Kconfig build support patch for the newly introduced
      kernel module toshiba_haps.
      Signed-off-by: NAzael Avalos <coproscefalo@gmail.com>
      Signed-off-by: NMatthew Garrett <matthew.garrett@nebula.com>
      186e4e89