1. 24 2月, 2017 12 次提交
    • L
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma · af17fe7a
      Linus Torvalds 提交于
      Pull Mellanox rdma updates from Doug Ledford:
       "Mellanox specific updates for 4.11 merge window
      
        Because the Mellanox code required being based on a net-next tree, I
        keept it separate from the remainder of the RDMA stack submission that
        is based on 4.10-rc3.
      
        This branch contains:
      
         - Various mlx4 and mlx5 fixes and minor changes
      
         - Support for adding a tag match rule to flow specs
      
         - Support for cvlan offload operation for raw ethernet QPs
      
         - A change to the core IB code to recognize raw eth capabilities and
           enumerate them (touches non-Mellanox code)
      
         - Implicit On-Demand Paging memory registration support"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (40 commits)
        IB/mlx5: Fix configuration of port capabilities
        IB/mlx4: Take source GID by index from HW GID table
        IB/mlx5: Fix blue flame buffer size calculation
        IB/mlx4: Remove unused variable from function declaration
        IB: Query ports via the core instead of direct into the driver
        IB: Add protocol for USNIC
        IB/mlx4: Support raw packet protocol
        IB/mlx5: Support raw packet protocol
        IB/core: Add raw packet protocol
        IB/mlx5: Add implicit MR support
        IB/mlx5: Expose MR cache for mlx5_ib
        IB/mlx5: Add null_mkey access
        IB/umem: Indicate that process is being terminated
        IB/umem: Update on demand page (ODP) support
        IB/core: Add implicit MR flag
        IB/mlx5: Support creation of a WQ with scatter FCS offload
        IB/mlx5: Enable QP creation with cvlan offload
        IB/mlx5: Enable WQ creation and modification with cvlan offload
        IB/mlx5: Expose vlan offloads capabilities
        IB/uverbs: Enable QP creation with cvlan offload
        ...
      af17fe7a
    • L
      Merge tag 'vfio-v4.11-rc1' of git://github.com/awilliam/linux-vfio · f14cc3b1
      Linus Torvalds 提交于
      Pull VFIO updates from Alex Williamson:
      
       - Kconfig fixes for SPAPR_TCE_IOMMU=n (Michael Ellerman)
      
       - Module softdep rather than request_module to simplify usage from
         initrd (Alex Williamson)
      
       - Comment typo fix (Changbin Du)
      
      * tag 'vfio-v4.11-rc1' of git://github.com/awilliam/linux-vfio:
        vfio: fix a typo in comment of function vfio_pin_pages
        vfio: Replace module request with softdep
        vfio/mdev: Use a module softdep for vfio_mdev
        vfio: Fix build break when SPAPR_TCE_IOMMU=n
      f14cc3b1
    • L
      Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 5bcbe22c
      Linus Torvalds 提交于
      Pull crypto update from Herbert Xu:
       "API:
         - Try to catch hash output overrun in testmgr
         - Introduce walksize attribute for batched walking
         - Make crypto_xor() and crypto_inc() alignment agnostic
      
        Algorithms:
         - Add time-invariant AES algorithm
         - Add standalone CBCMAC algorithm
      
        Drivers:
         - Add NEON acclerated chacha20 on ARM/ARM64
         - Expose AES-CTR as synchronous skcipher on ARM64
         - Add scalar AES implementation on ARM64
         - Improve scalar AES implementation on ARM
         - Improve NEON AES implementation on ARM/ARM64
         - Merge CRC32 and PMULL instruction based drivers on ARM64
         - Add NEON acclerated CBCMAC/CMAC/XCBC AES on ARM64
         - Add IPsec AUTHENC implementation in atmel
         - Add Support for Octeon-tx CPT Engine
         - Add Broadcom SPU driver
         - Add MediaTek driver"
      
      * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (142 commits)
        crypto: xts - Add ECB dependency
        crypto: cavium - switch to pci_alloc_irq_vectors
        crypto: cavium - switch to pci_alloc_irq_vectors
        crypto: cavium - remove dead MSI-X related define
        crypto: brcm - Avoid double free in ahash_finup()
        crypto: cavium - fix Kconfig dependencies
        crypto: cavium - cpt_bind_vq_to_grp could return an error code
        crypto: doc - fix typo
        hwrng: omap - update Kconfig help description
        crypto: ccm - drop unnecessary minimum 32-bit alignment
        crypto: ccm - honour alignmask of subordinate MAC cipher
        crypto: caam - fix state buffer DMA (un)mapping
        crypto: caam - abstract ahash request double buffering
        crypto: caam - fix error path for ctx_dma mapping failure
        crypto: caam - fix DMA API leaks for multiple setkey() calls
        crypto: caam - don't dma_map key for hash algorithms
        crypto: caam - use dma_map_sg() return code
        crypto: caam - replace sg_count() with sg_nents_for_len()
        crypto: caam - check sg_count() return value
        crypto: caam - fix HW S/G in ablkcipher_giv_edesc_alloc()
        ..
      5bcbe22c
    • L
      Merge tag 'rpmsg-v4.11' of git://github.com/andersson/remoteproc · 1db934a5
      Linus Torvalds 提交于
      Pull rpmsg updates from Bjorn Andersson:
       "This introduces an interface for user space to directly communicate on
        rpmsg endpoints without the implementation of specific kernel drivers,
        which is useful for e.g. debug channels:
      
      * tag 'rpmsg-v4.11' of git://github.com/andersson/remoteproc:
        rpmsg: rpmsg_create_ept() returns NULL on error
        rpmsg: qcom: smd: Return positively when not enabled
        rpmsg: unlock on error in rpmsg_eptdev_read()
        rpmsg: char: add CONFIG_NET dependency
        rpmsg: smd: Register rpmsg user space interface for edges
        rpmsg: Driver for user space endpoint interface
        rpmsg: qcom_smd: Implement endpoint "poll"
        rpmsg: Introduce "poll" to endpoint ops
        rpmsg: qcom_smd: Add support for "label" property
      1db934a5
    • L
      Merge tag 'rproc-v4.11' of git://github.com/andersson/remoteproc · a3919caa
      Linus Torvalds 提交于
      Pull remoteproc updates from Bjorn Andersson:
       "This introduces support for booting the dedicated sensor core in the
        Qualcomm MSM8996, updates the Qualcomm ADSP and Hexagon drivers to
        utilize SMD subdevice helpers for properly handle shutdowns and
        restarts of the remoteproc, add virtio support to the ST remoteproc
        and refactor the Qualcomm Hexagon driver to handle variations between
        platforms.
      
        The support code for parsing, loading and authenticating Qualcomm
        firmware files (MDT) is refactored and move to drivers/soc/qcom, to
        allow for non-remoteproc drivers to utilize this.
      
        Finally it brings some cleanups to the remoteproc core"
      
      * tag 'rproc-v4.11' of git://github.com/andersson/remoteproc: (27 commits)
        remoteproc: qcom: mdt_loader: Use signed type for offset
        remoteproc: st: add virtio communication support
        remoteproc: st: correct probe error management
        remoteproc: Modify the function names
        remoteproc: Reduce asynchronous request_firmware to auto-boot only
        remoteproc: Drop qcom_scm_pas_supported() from adsp_probe()
        MAINTAINERS: Add missing rpmsg include path
        remoteproc: qcom: Use common SMD edge handler
        remoteproc: qcom: wcnss: Make SMD handling common
        remoteproc: Move qcom_mdt_loader into drivers/soc/qcom
        remoteproc: qcom: mdt_loader: Refactor MDT loader
        remoteproc: qcom: mdt_loader: Don't overwrite firmware object
        remoteproc: qcom: Extract non-mdt related helper
        remoteproc: qcom: q6v5: Decouple driver from MDT loader
        remoteproc: qcom: q6v5: Remove mss supply from 8916
        remoteproc: qcom: fix initializers for qcom_mss_reg_res array
        remoteproc: Drop firmware_loading_complete
        remoteproc: Add RPROC_DELETED state
        remoteproc: Move rproc_delete_debug_dir() to rproc_del()
        remoteproc: qcom: Add SLPI rproc support to load and boot slpi proc.
        ...
      a3919caa
    • L
      Merge tag 'gfs2-4.11.addendum' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 · 15192b02
      Linus Torvalds 提交于
      Pull GFS2 fix from Bob Peterson:
       "This is an addendum for the 4.11 merge window.
      
        Andy Price wrote this patch to close a nasty race condition that
        allows access to glocks that are being destroyed. Without this patch,
        GFS2 is vulnerable to random corruption and kernel panic"
      
      * tag 'gfs2-4.11.addendum' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
        gfs2: Add missing rcu locking for glock	lookup
      15192b02
    • L
      Merge tag 'sound-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 28cbc335
      Linus Torvalds 提交于
      Pull sound updates from Takashi Iwai:
       "Here is the update of sound bits for 4.11: again at this time, no big
        changes in ALSA and ASoC core but only cosmetic changes like
        consitifaction.
      
        Meanwhile, quite a lot of developments are seen in a few driver side.
      
        ALSA Core:
         - Clean up, consitification of some ops
      
        HD-audio:
         - A slight behavior change of single_cmd option
         - Quirks for AmigaOne X1000, Samsung Ativ Book 8, Dell AiO, ALC221
           HP, and fixes for Lewisburg controller
         - Realtek ALC299, ALC1220 codecs
      
        Others:
         - USB-audio: Tascam US-16x08 DSP mixer quirk
         - Intel HDMI LPE audio support for Baytrail / Cherrytrail; this
           contains some updates in drm/i915 for the new platform binding
      
        ASoC:
         - Lots of updates in Intel drivers, mostly for DisplayPort and HDMI
           on Skylake and onwards, as well as more Baytrail / Cherrytrail
           boards support
         - Channel mapping support for HDMI
         - Support for AllWinner A31 and A33, Everest Semiconductor ES8328,
           Nuvoton NAU8540.
      
      * tag 'sound-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (323 commits)
        ALSA: usb-audio: Tidy up mixer_us16x08.c
        ALSA: usb-audio: Fix memory leak and corruption in mixer_us16x08.c
        ALSA: usb-audio: purge needless variable length array
        ALSA: x86: hdmi: select CONFIG_SND_PCM
        ALSA: x86: Don't enable runtime PM as default
        ALSA: x86: Use runtime PM autosuspend
        ALSA: usb-audio: localize function without external linkage
        ALSA: usb-audio: localize one-referrer variable
        ALSA: usb-audio: Tascam US-16x08 DSP mixer quirk
        ALSA: emu10k1: constify snd_emux_operators structure
        ASoC: sun4i-spdif: drop unnessary snd_soc_unregister_component()
        ASoC: Intel: bxt: Add jack port initialize in bxt_rt298 machine
        ASoC: nau8825: automatic BCLK and LRC divde in master mode
        ASoC: hdac_hdmi: Add device id for Geminilake
        ASoC: Intel: Skylake: Add Geminlake IDs
        ASoC: rt298: Add DMI match for Geminilake reference platform
        ASoC: Intel: Skylake: Check device type to get endpoint configuration
        ASoC: Intel: bxt: Add jack port initialize in da7219_max98357a machine
        ASoC: Intel: Skylake: Add jack port initialize in nau88l25_ssm4567 machine
        ASoC: Intel: Skylake: Add jack port initialize in nau88l25_max98357a machine
        ...
      28cbc335
    • L
      Merge tag 'gpio-v4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · 1ec5c186
      Linus Torvalds 提交于
      Pull GPIO updates from Linus Walleij:
       "This is the bulk of GPIO changes for the v4.11 cycle
      
        Core changes:
      
         - Augment fwnode_get_named_gpiod() to configure the GPIO pin
           immediately after requesting it like all other APIs do. This is a
           treewide change also updating all users.
      
         - Pass a GPIO label down to gpiod_request() from
           fwnode_get_named_gpiod(). This makes debugfs and the userspace ABI
           correctly reflect the current in-kernel consumer of a pin taken
           using this abstraction. This is a treewide change also updating all
           users.
      
         - Rename devm_get_gpiod_from_child() to
           devm_fwnode_get_gpiod_from_child() to reflect the fact that this
           function is operating on a fwnode object. This is a treewide change
           also updating all users.
      
         - Make it possible to take multiple GPIOs in a single hog of device
           tree hogs.
      
         - The refactorings switching GPIO chips to use the .set_config()
           callback using standard pin control properties and providing a
           backend into the pin control subsystem that were also merged into
           the pin control tree naturally appear here too.
      
        Testing instrumentation:
      
         - A whole slew of cleanups and improvements to the mockup GPIO
           driver. We now have an extended userspace test exercising the
           subsystem, and we can inject interrupts etc from userspace to fully
           test the core GPIO functionality.
      
        New drivers:
      
         - New driver for the Cortina Systems Gemini GPIO controller.
      
         - New driver for the Exar XR17V352/354/358 chips.
      
         - New driver for the ACCES PCI-IDIO-16 PCI GPIO card.
      
        Driver changes:
      
         - RCAR: set the irqchip parent device, add fine-grained runtime PM
           support.
      
         - pca953x: support optional RESET control line on the chip.
      
         - DaVinci: cleanups and simplifications. Add support for multiple
           instances.
      
         - .set_multiple() and naming of lines on more or less all of the
           ISA/PCI GPIO controllers.
      
         - mcp23s08: refactored to use regmap as a first step to further
           rewrites and modernizations"
      
      * tag 'gpio-v4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (61 commits)
        gpio: reintroduce devm_get_gpiod_from_child()
        gpio: pci-idio-16: Fix PCI BAR index
        gpio: pci-idio-16: Fix PCI device ID code
        gpio: mockup: implement event injecting over debugfs
        gpio: mockup: add a dummy irqchip
        gpio: mockup: implement naming the lines
        gpio: mockup: code shrink
        gpio: mockup: readability tweaks
        gpio: Add GPIO support for the ACCES PCI-IDIO-16
        gpio: Add the devm_fwnode_get_index_gpiod_from_child() helper
        gpio: Rename devm_get_gpiod_from_child()
        gpio: mcp23s08: Select REGMAP/REGMAP_I2C to fix build error
        gpio: ws16c48: Add support for GPIO names
        gpio: gpio-mm: Add support for GPIO names
        gpio: 104-idio-16: Add support for GPIO names
        gpio: 104-idi-48: Add support for GPIO names
        gpio: 104-dio-48e: Add support for GPIO names
        gpio: ws16c48: Remove unnecessary driver_data set
        gpio: gpio-mm: Remove unnecessary driver_data set
        gpio: 104-idio-16: Remove unnecessary driver_data set
        ...
      1ec5c186
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · d5dee39b
      Linus Torvalds 提交于
      Pull input updates from Dmitry:
      
       - a new driver for Zeitech touchscreen controller
      
       - a new driver for Samsung "touchkeys"
      
       - touchscreen driver for Moorestown platform has been removed because
         platform support is gone
      
       - MPU3050 accelerometer driver was removed in favor of IIO driver
      
       - miscellaneous driver cleanup and fixes
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (88 commits)
        Input: zet6223 - export OF device ID as module aliases
        Input: tsc2004/5 - switch to using generic device properties
        Input: tsc2004/5 - fix regulator handling
        Input: tsc2005 - add OF device table
        Input: add driver for Zeitec ZET6223
        Input: joydev - do not report stale values on first open
        Input: synaptics-rmi4 - forward upper mechanical buttons to PS/2 guest
        Input: synaptics-rmi4 - clean up F30 implementation
        Input: synaptics - use SERIO_OOB_DATA to handle trackstick buttons
        Input: psmouse - add a custom serio protocol to send extra information
        Input: synaptics-rmi4 - fix error return code in rmi_probe_interrupts()
        Input: xpad - restore LED state after device resume
        Input: synaptics-rmi4 - add rmi_find_function()
        Input: xpad - fix stuck mode button on Xbox One S pad
        Input: joydev - use clamp() macro
        Input: refuse to register absolute devices without absinfo
        Input: synaptics-rmi4 - add sysfs interfaces for hardware IDs
        Input: synaptics-rmi4 - add sysfs attribute update_fw_status
        Input: mousedev - stop offering PS/2 to userspace by default
        Input: tca8418 - switch to using generic device properties
        ...
      d5dee39b
    • L
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma · 4cc4b932
      Linus Torvalds 提交于
      Pull rdma updates from Doug Ledford:
       "First set of updates for 4.11 kernel merge window
      
         - Add new Broadcom bnxt_re RoCE driver
         - rxe driver updates
         - ioctl cleanups
         - ETH_P_IBOE declaration cleanup
         - IPoIB changes
         - Add port state cache
         - Allow srpt driver to accept guids as port names in config
         - Update to hfi1 driver
         - Update to srp driver
         - Lots of misc minor changes all over"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (114 commits)
        RDMA/bnxt_re: fix for "bnxt_en: Update to firmware interface spec 1.7.0."
        rdma_cm: fail iwarp accepts w/o connection params
        IB/srp: Drain the send queue before destroying a QP
        IB/core: Add support for draining IB_POLL_DIRECT completion queues
        IB/srp: Improve an error path
        IB/srp: Make a diagnostic message more informative
        IB/srp: Document locking conventions
        IB/srp: Fix race conditions related to task management
        IB/srp: Avoid that duplicate responses trigger a kernel bug
        IB/SRP: Avoid using IB_MR_TYPE_SG_GAPS
        RDMA/qedr: Fix some error handling
        RDMA/bnxt_re: add DCB dependency
        IB/hns: include linux/module.h
        IB/vmw_pvrdma: Expose vendor error to ULPs
        vmw_pvrdma: switch to pci_alloc_irq_vectors
        IB/hfi1: use size_t for passing array length
        IB/ipoib: Remove redudant label
        IB/ipoib: remove the unnecessary memory free
        IB/mthca: switch to pci_alloc_irq_vectors
        IB/hfi1: Code reuse with memdup_copy
        ...
      4cc4b932
    • L
      Merge tag 'backlight-for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight · a57eaa1f
      Linus Torvalds 提交于
      Pull backlight updates from Lee Jones:
       "Core Frameworks:
         - Add Daniel Thompson as co-maintainer
      
        Fix-ups:
         - Improve error handling; adp5520_bl
         - Split initial power checks into dedicated function; pwm_bl
         - Check current PWM status; pwm_bl
      
        Bug Fixes:
         - Fix potential race; lcd
         - Fix module auto-loading; da9052"
      
      * tag 'backlight-for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
        MAINTAINERS: Rework entry for Backlight
        backlight: da9052: Fix module autoload
        backlight: pwm_bl: Check the PWM state for initial backlight power state
        backlight: pwm_bl: Move the checks for initial power state to a separate function
        backlight: adp5520: Fix error handling in adp5520_bl_probe()
        backlight: lcd: Fix race condition during register
      a57eaa1f
    • L
      Merge tag 'mfd-for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd · df9cdc17
      Linus Torvalds 提交于
      Pull MFD updates from Lee Jones:
       "Core Frameworks:
         - Add new !TOUCHSCREEN_SUN4I dependency for SUN4I_GPADC
         - List include/dt-bindings/mfd/* to files supported in MAINTAINERS
      
        New Drivers:
         - Intel Apollo Lake SPI NOR
         - ST STM32 Timers (Advanced, Basic and PWM)
         - Motorola 6556002 CPCAP (PMIC)
      
        New Device Support:
         - Add support for AXP221 to axp20x
         - Add support for Intel Gemini Lake to intel-lpss-pci
         - Add support for MT6323 LED to mt6397-core
         - Add support for COMe-bBD#, COMe-bSL6, COMe-bKL6, COMe-cAL6 and
           COMe-cKL6 to kempld-core
      
        New Functionality:
         - Add support for Analog CODAC to sun6i-prcm
         - Add support for Watchdog to lpc_ich
      
        Fix-ups:
         - Error handling improvements; axp288_charger, axp20x, ab8500-sysctrl
         - Adapt platform data handling; axp20x
         - IRQ handling improvements; arizona, axp20x
         - Remove superfluous code; arizona, axp20x, lpc_ich
         - Trivial coding style/spelling fixes; axp20x, abx500, mfd.txt
         - Regmap fix-ups; axp20x
         - DT changes; mfd.txt, aspeed-lpc, aspeed-gfx, ab8500-core, tps65912,
           mt6397
         - Use new I2C probing mechanism; max77686
         - Constification; rk808
      
        Bug Fixes:
         - Stop data transfer whilst suspended; cros_ec"
      
      * tag 'mfd-for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (43 commits)
        mfd: lpc_ich: Enable watchdog on Intel Apollo Lake PCH
        mfd: lpc_ich: Remove useless comments in core part
        mfd: Add support for several boards to Kontron PLD driver
        mfd: constify regmap_irq_chip structures
        MAINTAINERS: Add include/dt-bindings/mfd to MFD entry
        mfd: cpcap: Add minimal support
        mfd: mt6397: Add MT6323 LED support into MT6397 driver
        Documentation: devicetree: Add LED subnode binding for MT6323 PMIC
        mfd: tps65912: Export OF device ID table as module aliases
        mfd: ab8500-core: Rename clock device and compatible
        mfd: cros_ec: Send correct suspend/resume event to EC
        mfd: max77686: Remove I2C device ID table
        mfd: max77686: Use the struct i2c_driver .probe_new instead of .probe
        mfd: max77686: Use of_device_get_match_data() helper
        mfd: max77686: Don't attempt to get i2c_device_id .data
        mfd: ab8500-sysctrl: Handle probe deferral
        mfd: intel-lpss: Add Intel Gemini Lake PCI IDs
        mfd: axp20x: Fix AXP806 access errors on cold boot
        mfd: cros_ec: Send suspend state notification to EC
        mfd: cros_ec: Prevent data transfer while device is suspended
        ...
      df9cdc17
  2. 23 2月, 2017 28 次提交