1. 28 Aug, 2014 2 commits
  2. 26 Aug, 2014 21 commits
  3. 07 Aug, 2014 8 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · 158c1294
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 172bfe09
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge git://www.linux-watchdog.org/linux-watchdog · a1b0a006
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 77251319
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 6b22df74
      Linus Torvalds authored
      Pull SCSI updates from James Bottomley:
       "This patch set consists of the usual driver updates (ufs, storvsc,
        pm8001 hpsa).  It also has removal of the user space target driver
        code (everyone is using LIO now), a partial PCI MSI-X update, more
        multi-queue updates, conversion to 64 bit LUNs (so we could
        theoretically cope with any LUN returned by a device) and placeholder
        support for the ZBC device type (Shingle drives), plus an assortment
        of minor updates and bug fixes"
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (143 commits)
        scsi: do not issue SCSI RSOC command to Promise Vtrak E610f
        vmw_pvscsi: Use pci_enable_msix_exact() instead of pci_enable_msix()
        pm8001: Fix invalid return when request_irq() failed
        lpfc: Remove superfluous call to pci_disable_msix()
        isci: Use pci_enable_msix_exact() instead of pci_enable_msix()
        bfa: Use pci_enable_msix_exact() instead of pci_enable_msix()
        bfa: Cleanup bfad_setup_intr() function
        bfa: Do not call pci_enable_msix() after it failed once
        fnic: Use pci_enable_msix_exact() instead of pci_enable_msix()
        scsi: use short driver name for per-driver cmd slab caches
        scsi_debug: support scsi-mq, queues and locks
        Drivers: add blist flags
        scsi: ufs: fix endianness sparse warnings
        scsi: ufs: make undeclared functions static
        bnx2i: Update driver version to 2.7.10.1
        pm8001: fix a memory leak in nvmd_resp
        pm8001: fix update_flash
        pm8001: fix a memory leak in flash_update
        pm8001: Cleaning up uninitialized variables
        pm8001: Fix to remove null pointer checks that could never happen
        ...
      6b22df74
    • Linus Torvalds's avatar
      Merge tag 'sound-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 930e0312
      Linus Torvalds authored
      Pull sound updates from Takashi Iwai:
       "There've been many updates in ASoC side at this time, especially the
        framework enhancement for multiple CODECs on a single DAI and more
        componentization works.
      
        The only major change in ALSA core is the addition of timestamp type
        in sw_params field.  This should behave in backward compatible way.
      
        Other than that, there are lots of small changes and new drivers in
        wide range, including a large code cut in HD-audio driver for
        deprecated static quirks.  Some highlights are below:
      
        ALSA Core:
         - Add the new timestamp type field to sw_params to choose
           MONOTONIC_RAW type
      
        HD-audio:
         - Continued conversion to standard printk macros, generic code
           cleanups
         - Removal of obsoleted static quirk codes for Conexant and C-Media
           codecs
         - Fixups for HP Envy TS, Dell XPS 15, HP and Dell mute/mic LED,
           Gigabyte BXBT-2807 mobo
         - Intel Braswell support
      
        ASoC:
         - Support for multiple CODECs attached to a single DAI, enabling
           systems with for example multiple DAC/speaker drivers on a single
           link, contributed by Benoit Cousson based on work from Misael Lopez
           Cruz
         - Support for byte controls larger than 256 bytes based on the use of
           TLVs contributed by Omair Mohammed Abdullah
         - More componentisation work from Lars-Peter Clausen
         - The remainder of the conversions of CODEC drivers to params_width()
           by Mark Brown
         - Drivers for Cirrus Logic CS4265, Freescale i.MX ASRC blocks,
           Realtek RT286 and RT5670, Rockchip RK3xxx I2S controllers and Texas
           Instruments TAS2552
         - Lots of updates and fixes, especially to the DaVinci, Intel,
           Freescale, Realtek, and rcar drivers"
      
      * tag 'sound-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (402 commits)
        ALSA: usb-audio: Whitespace cleanups for sound/usb/midi.*
        ALSA: usb-audio: Respond to suspend and resume callbacks for MIDI input
        sound/oss/pss: Remove typedefs pss_mixerdata and pss_confdata
        sound/oss/opl3: Remove typedef opl_devinfo
        ALSA: fireworks: fix specifiers in format strings for propper output
        ASoC: imx-audmux: Use uintptr_t for port numbers
        ASoC: davinci: Enable menuconfig entry for McASP
        ASoC: fsl_asrc: Don't access members of config before checking it
        ASoC: fsl_sarc_dma: Check pair before using it
        ASoC: adau1977: Fix truncation warning on 64 bit architectures
        ALSA: virtuoso: add Xonar Essence STX II support
        ALSA: riptide: fix %d confusingly prefixed with 0x in format strings
        ALSA: fireworks: fix %d confusingly prefixed with 0x in format strings
        ALSA: hda - add codec ID for Braswell display audio codec
        ALSA: hda - add PCI IDs for Intel Braswell
        ALSA: usb-audio: Adjust Gamecom 780 volume level
        ALSA: usb-audio: improve dmesg source grepability
        ASoC: rt5670: Fix duplicate const warnings
        ASoC: rt5670: Staticise non-exported symbols
        ASoC: Intel: update stream only on stream IPC msgs
        ...
      930e0312
    • Linus Torvalds's avatar
      Merge tag 'hsi-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi · ec6c0a77
      Linus Torvalds authored
      Pull HSI changes from Sebastian Reichel:
       "Misc fixes in SSI related drivers"
      
      * tag 'hsi-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
        HSI: omap_ssi: Fix return value check in ssi_debug_add_ctrl()
        HSI: omap_ssi_port: Fix return value check in ssi_debug_add_port()
        HSI: ssi_protocol: Fix sparse non static symbol warning
        drivers/hsi/controllers/omap_ssi{,_port}.c: fix failure checks
      ec6c0a77
    • Linus Torvalds's avatar
      Merge tag 'for-v3.17' of git://git.infradead.org/battery-2.6 · 0498cf84
      Linus Torvalds authored
      Pull power supply changes from Sebastian Reichel:
       - Added iPaq h3xxx battery driver
       - Added Broadcom STB reset driver
       - DT support for rx51-battery
       - misc. fixes
      
      * tag 'for-v3.17' of git://git.infradead.org/battery-2.6:
        ipaq_micro_battery: fix sparse non static symbol warning
        power: add driver for battery reading on iPaq h3xxx
        power: twl4030_charger: detect battery presence prior to enabling charger
        power: reset: Add reboot driver for brcmstb
        power_supply: Fix sparse non static symbol warning
        power_supply: Add inlmt,iterm, min/max temp props
        charger: tps65090: Allow charger module to be used when no irq
        power/reset: Fix GPL v2 license string typo
        power: poweroff: gpio: convert to use descriptors
        bq27000: report missing device better.
        bq27x00_battery: Introduce the use of the managed version of kzalloc
        Documentation: DT: Document rx51-battery binding
        rx51_battery: convert to iio consumer
        bq2415x_charger: Fix Atomic Sleep Bug
      0498cf84
  4. 06 Aug, 2014 9 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide · 85417aef
      Linus Torvalds authored
      Pull IDE cleanup from David Miller:
       "Just one minor cleanup"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
        ide: use module_platform_driver()
      85417aef
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next · 049711bf
      Linus Torvalds authored
      Pull sparc updates from David Miller:
      
       1) Add sparc RAM output to /proc/iomem, from Bob Picco.
      
       2) Allow seeks on /dev/mdesc, from Khalid Aziz.
      
       3) Cleanup sparc64 I/O accessors, from Sam Ravnborg.
      
       4) If update_mmu_cache{,_pmd}() is called with an not-valid mapping, do
          not insert it into the TLB miss hash tables otherwise we'll
          livelock.  Based upon work by Christopher Alexander Tobias Schulze.
      
       5) Fix BREAK detection in sunsab driver when no actual characters are
          pending, from Christopher Alexander Tobias Schulze.
      
       6) Because we have modules --> openfirmware --> vmalloc ordering of
          virtual memory, the lazy VMAP TLB flusher can cons up an invocation
          of flush_tlb_kernel_range() that covers the openfirmware address
          range.  Unfortunately this will flush out the firmware's locked TLB
          mapping which causes all kinds of trouble.  Just split up the flush
          request if this happens, but in the long term the lazy VMAP flusher
          should probably be made a little bit smarter.
      
          Based upon work by Christopher Alexander Tobias Schulze.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next:
        sparc64: Fix up merge thinko.
        sparc: Add "install" target
        arch/sparc/math-emu/math_32.c: drop stray break operator
        sparc64: ldc_connect() should not return EINVAL when handshake is in progress.
        sparc64: Guard against flushing openfirmware mappings.
        sunsab: Fix detection of BREAK on sunsab serial console
        bbc-i2c: Fix BBC I2C envctrl on SunBlade 2000
        sparc64: Do not insert non-valid PTEs into the TSB hash table.
        sparc64: avoid code duplication in io_64.h
        sparc64: reorder functions in io_64.h
        sparc64: drop unused SLOW_DOWN_IO definitions
        sparc64: remove macro indirection in io_64.h
        sparc64: update IO access functions in PeeCeeI
        sparcspkr: use sbus_*() primitives for IO
        sparc: Add support for seek and shorter read to /dev/mdesc
        sparc: use %s for unaligned panic
        drivers/sbus/char: Micro-optimization in display7seg.c
        display7seg: Introduce the use of the managed version of kzalloc
        sparc64 - add mem to iomem resource
      049711bf
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next · ae045e24
      Linus Torvalds authored
      Pull networking updates from David Miller:
       "Highlights:
      
         1) Steady transitioning of the BPF instructure to a generic spot so
            all kernel subsystems can make use of it, from Alexei Starovoitov.
      
         2) SFC driver supports busy polling, from Alexandre Rames.
      
         3) Take advantage of hash table in UDP multicast delivery, from David
            Held.
      
         4) Lighten locking, in particular by getting rid of the LRU lists, in
            inet frag handling.  From Florian Westphal.
      
         5) Add support for various RFC6458 control messages in SCTP, from
            Geir Ola Vaagland.
      
         6) Allow to filter bridge forwarding database dumps by device, from
            Jamal Hadi Salim.
      
         7) virtio-net also now supports busy polling, from Jason Wang.
      
         8) Some low level optimization tweaks in pktgen from Jesper Dangaard
            Brouer.
      
         9) Add support for ipv6 address generation modes, so that userland
            can have some input into the process.  From Jiri Pirko.
      
        10) Consolidate common TCP connection request code in ipv4 and ipv6,
            from Octavian Purdila.
      
        11) New ARP packet logger in netfilter, from Pablo Neira Ayuso.
      
        12) Generic resizable RCU hash table, with intial users in netlink and
            nftables.  From Thomas Graf.
      
        13) Maintain a name assignment type so that userspace can see where a
            network device name came from (enumerated by kernel, assigned
            explicitly by userspace, etc.) From Tom Gundersen.
      
        14) Automatic flow label generation on transmit in ipv6, from Tom
            Herbert.
      
        15) New packet timestamping facilities from Willem de Bruijn, meant to
            assist in measuring latencies going into/out-of the packet
            scheduler, latency from TCP data transmission to ACK, etc"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1536 commits)
        cxgb4 : Disable recursive mailbox commands when enabling vi
        net: reduce USB network driver config options.
        tg3: Modify tg3_tso_bug() to handle multiple TX rings
        amd-xgbe: Perform phy connect/disconnect at dev open/stop
        amd-xgbe: Use dma_set_mask_and_coherent to set DMA mask
        net: sun4i-emac: fix memory leak on bad packet
        sctp: fix possible seqlock seadlock in sctp_packet_transmit()
        Revert "net: phy: Set the driver when registering an MDIO bus device"
        cxgb4vf: Turn off SGE RX/TX Callback Timers and interrupts in PCI shutdown routine
        team: Simplify return path of team_newlink
        bridge: Update outdated comment on promiscuous mode
        net-timestamp: ACK timestamp for bytestreams
        net-timestamp: TCP timestamping
        net-timestamp: SCHED timestamp on entering packet scheduler
        net-timestamp: add key to disambiguate concurrent datagrams
        net-timestamp: move timestamp flags out of sk_flags
        net-timestamp: extend SCM_TIMESTAMPING ancillary data struct
        cxgb4i : Move stray CPL definitions to cxgb4 driver
        tcp: reduce spurious retransmits due to transient SACK reneging
        qlcnic: Initialize dcbnl_ops before register_netdev
        ...
      ae045e24
    • Linus Torvalds's avatar
      Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random · f4f142ed
      Linus Torvalds authored
      Pull randomness updates from Ted Ts'o:
       "Cleanups and bug fixes to /dev/random, add a new getrandom(2) system
        call, which is a superset of OpenBSD's getentropy(2) call, for use
        with userspace crypto libraries such as LibreSSL.
      
        Also add the ability to have a kernel thread to pull entropy from
        hardware rng devices into /dev/random"
      
      * tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
        hwrng: Pass entropy to add_hwgenerator_randomness() in bits, not bytes
        random: limit the contribution of the hw rng to at most half
        random: introduce getrandom(2) system call
        hw_random: fix sparse warning (NULL vs 0 for pointer)
        random: use registers from interrupted code for CPU's w/o a cycle counter
        hwrng: add per-device entropy derating
        hwrng: create filler thread
        random: add_hwgenerator_randomness() for feeding entropy from devices
        random: use an improved fast_mix() function
        random: clean up interrupt entropy accounting for archs w/o cycle counters
        random: only update the last_pulled time if we actually transferred entropy
        random: remove unneeded hash of a portion of the entropy pool
        random: always update the entropy pool under the spinlock
      f4f142ed
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · bb2cbf5e
      Linus Torvalds authored
      Pull security subsystem updates from James Morris:
       "In this release:
      
         - PKCS#7 parser for the key management subsystem from David Howells
         - appoint Kees Cook as seccomp maintainer
         - bugfixes and general maintenance across the subsystem"
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (94 commits)
        X.509: Need to export x509_request_asymmetric_key()
        netlabel: shorter names for the NetLabel catmap funcs/structs
        netlabel: fix the catmap walking functions
        netlabel: fix the horribly broken catmap functions
        netlabel: fix a problem when setting bits below the previously lowest bit
        PKCS#7: X.509 certificate issuer and subject are mandatory fields in the ASN.1
        tpm: simplify code by using %*phN specifier
        tpm: Provide a generic means to override the chip returned timeouts
        tpm: missing tpm_chip_put in tpm_get_random()
        tpm: Properly clean sysfs entries in error path
        tpm: Add missing tpm_do_selftest to ST33 I2C driver
        PKCS#7: Use x509_request_asymmetric_key()
        Revert "selinux: fix the default socket labeling in sock_graft()"
        X.509: x509_request_asymmetric_keys() doesn't need string length arguments
        PKCS#7: fix sparse non static symbol warning
        KEYS: revert encrypted key change
        ima: add support for measuring and appraising firmware
        firmware_class: perform new LSM checks
        security: introduce kernel_fw_from_file hook
        PKCS#7: Missing inclusion of linux/err.h
        ...
      bb2cbf5e
    • Jiri Kosina's avatar
      Merge branches 'for-3.17/upstream', 'for-3.17/cp2112', 'for-3.17/huion',... · cf6f3976
      Jiri Kosina authored
      Merge branches 'for-3.17/upstream', 'for-3.17/cp2112', 'for-3.17/huion', 'for-3.17/hyperv', 'for-3.17/i2c', 'for-3.17/lenovo', 'for-3.17/rmi' and 'for-3.17/sony' into for-linus
      cf6f3976
    • Christoph Jaeger's avatar
      ide: use module_platform_driver() · a53dae49
      Christoph Jaeger authored
      Eliminate boilerplate code by using module_platform_driver().
      Signed-off-by: default avatarChristoph Jaeger <christophjaeger@linux.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a53dae49
    • David S. Miller's avatar
      sparc64: Fix up merge thinko. · 5b6ff9df
      David S. Miller authored
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      5b6ff9df
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · e9011d08
      David S. Miller authored
      Conflicts:
      	arch/sparc/mm/init_64.c
      
      Conflict was simple non-overlapping additions.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e9011d08