1. 12 8月, 2014 2 次提交
  2. 11 8月, 2014 1 次提交
  3. 09 8月, 2014 6 次提交
  4. 08 8月, 2014 25 次提交
  5. 07 8月, 2014 6 次提交
    • L
      Merge branch 'akpm' (patchbomb from Andrew Morton) · 33caee39
      Linus Torvalds 提交于
      Merge incoming from Andrew Morton:
       - Various misc things.
       - arch/sh updates.
       - Part of ocfs2.  Review is slow.
       - Slab updates.
       - Most of -mm.
       - printk updates.
       - lib/ updates.
       - checkpatch updates.
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (226 commits)
        checkpatch: update $declaration_macros, add uninitialized_var
        checkpatch: warn on missing spaces in broken up quoted
        checkpatch: fix false positives for --strict "space after cast" test
        checkpatch: fix false positive MISSING_BREAK warnings with --file
        checkpatch: add test for native c90 types in unusual order
        checkpatch: add signed generic types
        checkpatch: add short int to c variable types
        checkpatch: add for_each tests to indentation and brace tests
        checkpatch: fix brace style misuses of else and while
        checkpatch: add --fix option for a couple OPEN_BRACE misuses
        checkpatch: use the correct indentation for which()
        checkpatch: add fix_insert_line and fix_delete_line helpers
        checkpatch: add ability to insert and delete lines to patch/file
        checkpatch: add an index variable for fixed lines
        checkpatch: warn on break after goto or return with same tab indentation
        checkpatch: emit a warning on file add/move/delete
        checkpatch: add test for commit id formatting style in commit log
        checkpatch: emit fewer kmalloc_array/kcalloc conversion warnings
        checkpatch: improve "no space after cast" test
        checkpatch: allow multiple const * types
        ...
      33caee39
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 6456a043
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
       "This fixes the most immediate fallout from yesterday's networking
        merge:
      
         1) sock_tx_timestamp() must not clear the passed in tx_flags, but
            rather add to them.  Fix from Eric Dumazet.
      
         2) The hyperv driver sendbuf region increase needs to be decreased
            slightly to handle older backends.  From KY Srinivasan.
      
         3) Fix RCU lockdep splats in netlink diag after recent hashing
            changes, from Thomas Graf.
      
         4) The new IPV6_FLOWLABEL was given a socket option number that
            overlapped with an existing IP6 tables one, breaking ip6_tables.
            Fixed by Pablo Neira Ayuso"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        netlink: hold nl_sock_hash_lock during diag dump
        tcp: md5: check md5 signature without socket lock
        net: fix USB network driver config option.
        net: reallocate new socket option number for IPV6_AUTOFLOWLABEL
        vmxnet3: fix decimal printf format specifiers prefixed with 0x
        net-timestamp: cumulative tcp timestamping fixes
        hyperv: Adjust the size of sendbuf region to support ws2008r2
        cxgb4: Fix for SR-IOV VF initialization
        net-timestamp: sock_tx_timestamp() fix
      6456a043
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · 158c1294
      Linus Torvalds 提交于
      Pull trivial tree changes from Jiri Kosina:
       "Summer edition of trivial tree updates"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (23 commits)
        doc: fix two typos in watchdog-api.txt
        irq-gic: remove file name from heading comment
        MAINTAINERS: Add miscdevice.h to file list for char/misc drivers.
        scsi: mvsas: mv_sas.c: Fix for possible null pointer dereference
        doc: replace "practise" with "practice" in Documentation
        befs: remove check for CONFIG_BEFS_RW
        scsi: doc: fix 'SCSI_NCR_SETUP_MASTER_PARITY'
        drivers/usb/phy/phy.c: remove a leading space
        mfd: fix comment
        cpuidle: fix comment
        doc: hpfall.c: fix missing null-terminate after strncpy call
        usb: doc: hotplug.txt code typos
        kbuild: fix comment in Makefile.modinst
        SH: add proper prompt to SH_MAGIC_PANEL_R2_VERSION
        ARM: msm: Remove MSM_SCM
        crypto: Remove MPILIB_EXTRA
        doc: CN: remove dead link, kerneltrap.org no longer works
        media: update reference, kerneltrap.org no longer works
        hexagon: update reference, kerneltrap.org no longer works
        doc: LSM: update reference, kerneltrap.org no longer works
        ...
      158c1294
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 172bfe09
      Linus Torvalds 提交于
      Pull HID updates from Jiri Kosina:
       "Some highlights:
      
         - hid-sony improvements of Sixaxis device support by Antonio Ospite
         - hid-hyperv driven devices can now be used as wakeup source, by
           Dexuan Cui
         - hid-lenovo driver is now more generic and supports more devices, by
           Jamie Lentin
         - hid-huion now supports wider range of tablets, by Nikolai
           Kondrashov
         - other various unsorted fixes and device ID additions"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (30 commits)
        HID: hyperv: register as a wakeup source
        HID: sony: Default initialize all elements of the LED max_brightness array to 1
        HID: huion: Fix sparse warnings
        HID: usbhid: Use flag HID_DISCONNECTED when a usb device is removed
        HID: ignore jabra gn9350e
        HID: cp2112: add I2C mode
        HID: use multi input quirk for 22b9:2968
        HID: rmi: only bind the hid-rmi driver to the mouse interface of composite USB devices
        HID: rmi: check that report ids exist in the report_id_hash before accessing their size
        HID: lenovo: Add support for Compact (BT|USB) keyboard
        HID: lenovo: Don't call function in condition, show error codes
        HID: lenovo: Prepare support for adding other devices
        HID: lenovo: Rename hid-lenovo-tpkbd to hid-lenovo
        HID: huion: Handle tablets with UC-Logic vendor ID
        HID: huion: Switch to generating report descriptor
        HID: huion: Don't ignore other interfaces
        HID: huion: Use "tablet" instead of specific model
        HID: add quirk for 0x04d9:0xa096 device
        HID: i2c-hid: call the hid driver's suspend and resume callbacks
        HID: rmi: change logging level of log messages related to unexpected reports
        ...
      172bfe09
    • L
      Merge git://www.linux-watchdog.org/linux-watchdog · a1b0a006
      Linus Torvalds 提交于
      Pull watchdog updates from Wim Van Sebroeck:
       - remove unnecessary checks after platform_get_resource()
       - fix watchdog api documentation typo's
       - imx2_wdt: adds big endianness support
       - move restart code to the sunxi watchdog driver
      
      * git://www.linux-watchdog.org/linux-watchdog:
        wdt: sunxi: Move restart code to the watchdog driver
        Documentation: fix two typos in watchdog-api.txt
        watchdog: imx2_wdt: adds big endianness support.
        watchdog: shwdt: Remove the unnecessary check of resource after platform_get_resource()
        watchdog: lantiq_wdt: Remove the un-necessary check of resource after platform_get_resource()
        watchdog: dw_wdt: Remove the un-necessary check after platform_get_resource()
      a1b0a006
    • L
      Merge tag 'pm+acpi-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 77251319
      Linus Torvalds 提交于
      Pull ACPI and power management updates from Rafael Wysocki:
       "Again, ACPICA leads the pack (47 commits), followed by cpufreq (18
        commits) and system suspend/hibernation (9 commits).
      
        From the new code perspective, the ACPICA update brings ACPI 5.1 to
        the table, including a new device configuration object called _DSD
        (Device Specific Data) that will hopefully help us to operate device
        properties like Device Trees do (at least to some extent) and changes
        related to supporting ACPI on ARM.
      
        Apart from that we have hibernation changes making it use radix trees
        to store memory bitmaps which should speed up some operations carried
        out by it quite significantly.  We also have some power management
        changes related to suspend-to-idle (the "freeze" sleep state) support
        and more preliminary changes needed to support ACPI on ARM (outside of
        ACPICA).
      
        The rest is fixes and cleanups pretty much everywhere.
      
        Specifics:
      
         - ACPICA update to upstream version 20140724.  That includes ACPI 5.1
           material (support for the _CCA and _DSD predefined names, changes
           related to the DMAR and PCCT tables and ARM support among other
           things) and cleanups related to using ACPICA's header files.  A
           major part of it is related to acpidump and the core code used by
           that utility.  Changes from Bob Moore, David E Box, Lv Zheng,
           Sascha Wildner, Tomasz Nowicki, Hanjun Guo.
      
         - Radix trees for memory bitmaps used by the hibernation core from
           Joerg Roedel.
      
         - Support for waking up the system from suspend-to-idle (also known
           as the "freeze" sleep state) using ACPI-based PCI wakeup signaling
           (Rafael J Wysocki).
      
         - Fixes for issues related to ACPI button events (Rafael J Wysocki).
      
         - New device ID for an ACPI-enumerated device included into the
           Wildcat Point PCH from Jie Yang.
      
         - ACPI video updates related to backlight handling from Hans de Goede
           and Linus Torvalds.
      
         - Preliminary changes needed to support ACPI on ARM from Hanjun Guo
           and Graeme Gregory.
      
         - ACPI PNP core cleanups from Arjun Sreedharan and Zhang Rui.
      
         - Cleanups related to ACPI_COMPANION() and ACPI_HANDLE() macros
           (Rafael J Wysocki).
      
         - ACPI-based device hotplug cleanups from Wei Yongjun and Rafael J
           Wysocki.
      
         - Cleanups and improvements related to system suspend from Lan
           Tianyu, Randy Dunlap and Rafael J Wysocki.
      
         - ACPI battery cleanup from Wei Yongjun.
      
         - cpufreq core fixes from Viresh Kumar.
      
         - Elimination of a deadband effect from the cpufreq ondemand governor
           and intel_pstate driver cleanups from Stratos Karafotis.
      
         - 350MHz CPU support for the powernow-k6 cpufreq driver from Mikulas
           Patocka.
      
         - Fix for the imx6 cpufreq driver from Anson Huang.
      
         - cpuidle core and governor cleanups from Daniel Lezcano, Sandeep
           Tripathy and Mohammad Merajul Islam Molla.
      
         - Build fix for the big_little cpuidle driver from Sachin Kamat.
      
         - Configuration fix for the Operation Performance Points (OPP)
           framework from Mark Brown.
      
         - APM cleanup from Jean Delvare.
      
         - cpupower utility fixes and cleanups from Peter Senna Tschudin,
           Andrey Utkin, Himangi Saraogi, Rickard Strandqvist, Thomas
           Renninger"
      
      * tag 'pm+acpi-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (118 commits)
        ACPI / LPSS: add LPSS device for Wildcat Point PCH
        ACPI / PNP: Replace faulty is_hex_digit() by isxdigit()
        ACPICA: Update version to 20140724.
        ACPICA: ACPI 5.1: Update for PCCT table changes.
        ACPICA/ARM: ACPI 5.1: Update for GTDT table changes.
        ACPICA/ARM: ACPI 5.1: Update for MADT changes.
        ACPICA/ARM: ACPI 5.1: Update for FADT changes.
        ACPICA: ACPI 5.1: Support for the _CCA predifined name.
        ACPICA: ACPI 5.1: New notify value for System Affinity Update.
        ACPICA: ACPI 5.1: Support for the _DSD predefined name.
        ACPICA: Debug object: Add current value of Timer() to debug line prefix.
        ACPICA: acpihelp: Add UUID support, restructure some existing files.
        ACPICA: Utilities: Fix local printf issue.
        ACPICA: Tables: Update for DMAR table changes.
        ACPICA: Remove some extraneous printf arguments.
        ACPICA: Update for comments/formatting. No functional changes.
        ACPICA: Disassembler: Add support for the ToUUID opererator (macro).
        ACPICA: Remove a redundant cast to acpi_size for ACPI_OFFSET() macro.
        ACPICA: Work around an ancient GCC bug.
        ACPI / processor: Make it possible to get local x2apic id via _MAT
        ...
      77251319