27 Apr, 2015

2 commits

  • Pull more power management and ACPI updates from Rafael Wysocki:
    "These are fixes mostly (intel_pstate, ACPI core, ACPI EC driver,
    cpupower tool), a new CPU ID for the Intel RAPL driver and one
    intel_pstate driver improvement that didn't make it to my previous
    pull requests due to timing.

    Specifics:

    - Fix a build warning in the intel_pstate driver showing up in
    non-SMP builds (Borislav Petkov)

    - Change one of the intel_pstate's P-state selection parameters for
    Baytrail and Cherrytrail CPUs to significantly improve performance
    at the cost of a small increase in energy consumption (Kristen
    Carlson Accardi)

    - Fix a NULL pointer dereference in the ACPI EC driver due to an
    unsafe list walk in the query handler removal routine (Chris
    Bainbridge)

    - Get rid of a false-positive lockdep warning in the ACPI container
    hot-remove code (Rafael J Wysocki)

    - Prevent the ACPI device enumeration code from creating device
    objects of a wrong type in some cases (Rafael J Wysocki)

    - Add Skylake processors support to the Intel RAPL power capping
    driver (Brian Bian)

    - Drop the stale MAINTAINERS entry for the ACPI dock driver that is
    regarded as part of the ACPI core and maintained along with it now
    (Chao Yu)

    - Fix cpupower tool breakage caused by a library API change in libpci
    3.3.0 (Lucas Stach)"

    * tag 'pm+acpi-4.1-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
    ACPI / scan: Add a scan handler for PRP0001
    ACPI / scan: Annotate physical_node_lock in acpi_scan_is_offline()
    ACPI / EC: fix NULL pointer dereference in acpi_ec_remove_query_handler()
    MAINTAINERS: remove maintainship entry of docking station driver
    powercap / RAPL: Add support for Intel Skylake processors
    cpufreq: intel_pstate: Fix an annoying !CONFIG_SMP warning
    intel_pstate: Change the setpoint for Atom params
    cpupower: fix breakage from libpci API change

    Linus Torvalds
     
  • …linux-platform-drivers-x86

    Pull x86 platform driver updates from Darren Hart:
    "This series includes significant updates to the toshiba_acpi driver
    and the reintroduction of the dell-laptop keyboard backlight additions
    I had to revert previously. Also included are various fixes for
    typos, warnings, correctness, and minor bugs.

    Specifics:

    dell-laptop:
    - add support for keyboard backlight.

    toshiba_acpi:
    - adaptive keyboard, hotkey, USB sleep and charge, and backlight
    updates. Update sysfs documentation.

    toshiba_bluetooth:
    - fix enabling/disabling loop on recent devices

    apple-gmux:
    - lock iGP IO to protect from vgaarb changes

    other:
    - Fix typos, clear gcc warnings, clarify pr_* messages, correct
    return types, update MAINTAINERS"

    * tag 'platform-drivers-x86-v4.1-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86: (25 commits)
    toshiba_acpi: Do not register vendor backlight when acpi_video bl is available
    MAINTAINERS: Add me on list of Dell laptop drivers
    platform: x86: dell-laptop: Add support for keyboard backlight
    Documentation/ABI: Update sysfs-driver-toshiba_acpi entry
    toshiba_acpi: Fix pr_* messages from USB Sleep Functions
    toshiba_acpi: Update and fix USB Sleep and Charge modes
    wmi: Use bool function return values of true/false not 1/0
    toshiba_bluetooth: Fix enabling/disabling loop on recent devices
    toshiba_bluetooth: Clean up *_add function and disable BT device at removal
    toshiba_bluetooth: Add three new functions to the driver
    toshiba_acpi: Fix the enabling of the Special Functions
    toshiba_acpi: Use the Hotkey Event Type function for keymap choosing
    toshiba_acpi: Add Hotkey Event Type function and definitions
    x86/wmi: delete unused wmi_data_lock mutex causing gcc warning
    apple-gmux: lock iGP IO to protect from vgaarb changes
    MAINTAINERS: Add missing Toshiba devices and add myself as maintainer
    toshiba_acpi: Update events in toshiba_acpi_notify
    intel-oaktrail: Fix trivial typo in comment
    thinkpad_acpi: off by one in adaptive_keyboard_hotkey_notify_hotkey()
    thinkpad_acpi: signedness bugs getting current_mode
    ...

    Linus Torvalds
     

25 Apr, 2015

1 commit

  • Pull slave-dmaengine updates from Vinod Koul:

    - new drivers for:
    - Ingenic JZ4780 controller
    - APM X-Gene controller
    - Freescale RaidEngine device
    - Renesas USB Controller

    - remove device_alloc_chan_resources dummy handlers

    - sh driver cleanups for peri peri and related emmc and asoc patches
    as well

    - fixes and enhancements spread over the drivers

    * 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (59 commits)
    dmaengine: dw: don't prompt for DW_DMAC_CORE
    dmaengine: shdmac: avoid unused variable warnings
    dmaengine: fix platform_no_drv_owner.cocci warnings
    dmaengine: pch_dma: fix memory leak on failure path in pch_dma_probe()
    dmaengine: at_xdmac: unlock spin lock before return
    dmaengine: xgene: devm_ioremap() returns NULL on error
    dmaengine: xgene: buffer overflow in xgene_dma_init_channels()
    dmaengine: usb-dmac: Fix dereferencing freed memory 'desc'
    dmaengine: sa11x0: report slave capabilities to upper layers
    dmaengine: vdma: Fix compilation warnings
    dmaengine: fsl_raid: statify fsl_re_chan_probe
    dmaengine: Driver support for FSL RaidEngine device.
    dmaengine: xgene_dma_init_ring_mngr() can be static
    Documentation: dma: Add documentation for the APM X-Gene SoC DMA device DTS binding
    arm64: dts: Add APM X-Gene SoC DMA device and DMA clock DTS nodes
    dmaengine: Add support for APM X-Gene SoC DMA engine driver
    dmaengine: usb-dmac: Add Renesas USB DMA Controller (USB-DMAC) driver
    dmaengine: renesas,usb-dmac: Add device tree bindings documentation
    dmaengine: edma: fixed wrongly initialized data parameter to the edma callback
    dmaengine: ste_dma40: fix implicit conversion
    ...

    Linus Torvalds
     

24 Apr, 2015

1 commit


23 Apr, 2015

9 commits

  • Pull InfiniBand/RDMA updates from Roland Dreier:

    - IPoIB fixes from Doug Ledford and Erez Shitrit

    - iSER updates from Sagi Grimberg

    - mlx4 GUID handling changes from Yishai Hadas

    - other misc fixes

    * tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (51 commits)
    mlx5: wrong page mask if CONFIG_ARCH_DMA_ADDR_T_64BIT enabled for 32Bit architectures
    IB/iser: Rewrite bounce buffer code path
    IB/iser: Bump version to 1.6
    IB/iser: Remove code duplication for a single DMA entry
    IB/iser: Pass struct iser_mem_reg to iser_fast_reg_mr and iser_reg_sig_mr
    IB/iser: Modify struct iser_mem_reg members
    IB/iser: Make fastreg pool cache friendly
    IB/iser: Move PI context alloc/free to routines
    IB/iser: Move fastreg descriptor pool get/put to helper functions
    IB/iser: Merge build page-vec into register page-vec
    IB/iser: Get rid of struct iser_rdma_regd
    IB/iser: Remove redundant assignments in iser_reg_page_vec
    IB/iser: Move memory reg/dereg routines to iser_memory.c
    IB/iser: Don't pass ib_device to fall_to_bounce_buff routine
    IB/iser: Remove a redundant struct iser_data_buf
    IB/iser: Remove redundant cmd_data_len calculation
    IB/iser: Fix wrong calculation of protection buffer length
    IB/iser: Handle fastreg/local_inv completion errors
    IB/iser: Fix unload during ep_poll wrong dereference
    ib_srpt: convert printk's to pr_* functions
    ...

    Linus Torvalds
     
  • Pull PCI fixes from Bjorn Helgaas:
    "These fix an ia64 regression caused by tighter resource checking we
    merged during the merge window and remove an invalid email address
    from MAINTAINERS.

    Resource management:
    - ia64: Treat all Address Space Descriptors as windows (Bjorn Helgaas)

    Miscellaneous:
    - MAINTAINERS: Remove Mohit Kumar (email bounces) (Bjorn Helgaas)"

    * tag 'pci-v4.1-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
    ia64/PCI: Treat all host bridge Address Space Descriptors (even consumers) as windows
    MAINTAINERS: Remove Mohit Kumar (email bounces)

    Linus Torvalds
     
  • Pull virtio updates from Rusty Russell:
    "Some virtio internal cleanups, a new virtio device "virtio input", and
    a change to allow the legacy virtio balloon.

    Most excitingly, some lguest work! No seriously, I got some cleanup
    patches"

    * tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
    virtio: drop virtio_device_is_legacy_only
    virtio_pci: support non-legacy balloon devices
    virtio_mmio: support non-legacy balloon devices
    virtio_ccw: support non-legacy balloon devices
    virtio: balloon might not be a legacy device
    virtio_balloon: transitional interface
    virtio_ring: Update weak barriers to use dma_wmb/rmb
    virtio_pci_modern: switch to type-safe io accessors
    virtio_pci_modern: type-safe io accessors
    lguest: handle traps on the "interrupt suppressed" iret instruction.
    virtio: drop a useless config read
    virtio_config: reorder functions
    Add virtio-input driver.
    lguest: suppress interrupts for single insn, not range.
    lguest: simplify lguest_iret
    lguest: rename i386_head.S in the comments
    lguest: explicitly set miscdevice's private_data NULL
    lguest: fix pending interrupt test.

    Linus Torvalds
     
  • Pull ARM SoC multiplatform code changes from Olof Johansson:
    "The changes here belong to two main platforms:

    - Atmel At91 is flipping the bit and going multiplatform. This
    includes some cleanups and removal of code, and the final flip of
    config dependencies

    - Shmobile has several platforms that are going multiplatform, but
    this branch also contains a bunch of cleanups that they weren't
    able to keep separate in a good way. THere's also a removal of one
    of their SoCs and the corresponding boards (sh7372 and mackerel)"

    * tag 'armsoc-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (67 commits)
    ARM: at91/pm: move AT91_MEMCTRL_* to pm.h
    ARM: at91/pm: move the standby functions to pm.c
    ARM: at91: fix pm_suspend.S compilation when ARMv6 is selected
    ARM: at91: add a Kconfig dependency on multi-platform
    ARM: at91: drop AT91_TIMER_HZ
    ARM: at91: remove hardware.h
    ARM: at91: remove SoC headers
    ARM: at91: remove useless mach/cpu.h
    ARM: at91: remove unused headers
    ARM: at91: switch at91_dt_defconfig to multiplatform
    ARM: at91: switch to multiplatform
    ARM: shmobile: r8a7778: enable multiplatform target
    ARM: shmobile: bockw: add sound to DT
    ARM: shmobile: r8a7778: add sound to DT
    ARM: shmobile: bockw: add devices hooked up to i2c0 to DT
    DT: i2c: add trivial binding for OKI ML86V7667 video decoder
    ARM: shmobile: r8a7778: common clock framework CPG driver
    ARM: shmobile: bockw dts: set extal clock frequency
    ARM: shmobile: bockw dts: Move Ethernet node to BSC
    ARM: shmobile: r8a73a4: Remove legacy code
    ...

    Linus Torvalds
     
  • Pull ARM SoC driver updates from Olof Johansson:
    "Driver updates for v4.1. Some of these are for drivers/soc, where we
    find more and more SoC-specific drivers these days. Some are for
    other driver subsystems where we have received acks from the
    appropriate maintainers.

    The larger parts of this branch are:

    - MediaTek support for their PMIC wrapper interface, a high-level
    interface for talking to the system PMIC over a dedicated I2C
    interface.

    - Qualcomm SCM driver has been moved to drivers/firmware. It's used
    for CPU up/down and needs to be in a shared location for arm/arm64
    common code.

    - cleanup of ARM-CCI PMU code.

    - another set of cleanusp to the OMAP GPMC code"

    * tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (43 commits)
    soc/mediatek: Remove unused variables
    clocksource: atmel-st: select MFD_SYSCON
    soc: mediatek: Add PMIC wrapper for MT8135 and MT8173 SoCs
    arm-cci: Fix CCI PMU event validation
    arm-cci: Split the code for PMU vs driver support
    arm-cci: Get rid of secure transactions for PMU driver
    arm-cci: Abstract the CCI400 PMU specific definitions
    arm-cci: Rearrange code for splitting PMU vs driver code
    drivers: cci: reject groups spanning multiple HW PMUs
    ARM: at91: remove useless include
    clocksource: atmel-st: remove mach/hardware dependency
    clocksource: atmel-st: use syscon/regmap
    ARM: at91: time: move the system timer driver to drivers/clocksource
    ARM: at91: properly initialize timer
    ARM: at91: at91rm9200: remove deprecated arm_pm_restart
    watchdog: at91rm9200: implement restart handler
    watchdog: at91rm9200: use the system timer syscon
    mfd: syscon: Add atmel system timer registers definition
    ARM: at91/dt: declare atmel,at91rm9200-st as a syscon
    soc: qcom: gsbi: Add support for ADM CRCI muxing
    ...

    Linus Torvalds
     
  • Pull ARM DT updates from Olof Johansson:
    "As always, this tends to be one of our bigger branches. There are
    lots of updates this release, but not that many jumps out as something
    that needs more detailed coverage. Some of the highlights are:

    - DTs for the new Annapurna Labs Alpine platform

    - more graphics DT pieces falling into place on Exynos, bridges,
    clocks.

    - plenty of DT updates for Qualcomm platforms for various IP blocks

    - some churn on Tegra due to switch-over to tool-generated pinctrl
    data

    - misc fixes and updates for Atmel at91 platforms

    - various DT updates to add IP block support on Broadcom's Cygnus
    platforms

    - more updates for Renesas platforms as DT support is added for
    various IP blocks (IPMMU, display, audio, etc)"

    * tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (231 commits)
    ARM: dts: alpine: add internal pci
    Revert "ARM: dts: mt8135: Add pinctrl/GPIO/EINT node for mt8135."
    ARM: mvebu: use 0xf1000000 as internal registers on Armada 370 DB
    ARM: dts: qcom: Add idle state device nodes for 8064
    ARM: dts: qcom: Add idle states device nodes for 8084
    ARM: dts: qcom: Add idle states device nodes for 8974/8074
    ARM: dts: qcom: Update power-controller device node for 8064 Krait CPUs
    ARM: dts: qcom: Add power-controller device node for 8084 Krait CPUs
    ARM: dts: qcom: Add power-controller device node for 8074 Krait CPUs
    devicetree: bindings: Document qcom,idle-states
    devicetree: bindings: Update qcom,saw2 node bindings
    dt-bindings: Add #defines for MSM8916 clocks and resets
    arm: dts: qcom: Add LPASS Audio HW to IPQ8064 device tree
    arm: dts: qcom: Add APQ8084 chipset SPMI PMIC's nodes
    arm: dts: qcom: Add 8x74 chipset SPMI PMIC's nodes
    arm: dts: qcom: Add SPMI PMIC Arbiter nodes for APQ8084 and MSM8974
    arm: dts: qcom: Add LCC nodes
    arm: dts: qcom: Add TCSR support for MSM8960
    arm: dts: qcom: Add TCSR support for MSM8660
    arm: dts: qcom: Add TCSR support for IPQ8064
    ...

    Linus Torvalds
     
  • Pull ARM SoC platform updates from Olof Johansson:
    "Our SoC branch usually contains expanded support for new SoCs and
    other core platform code. In this case, that includes:

    - support for the new Annapurna Labs "Alpine" platform

    - a rework greatly simplifying adding new platform support to the
    MCPM subsystem (Multi-cluster power management)

    - cpuidle and PM improvements for Exynos3250

    - misc updates for Renesas, OMAP, Meson, i.MX. Some of these could
    have gone in other branches but ended up here for various reasons"

    * tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (53 commits)
    ARM: alpine: add support for generic pci
    ARM: Exynos: migrate DCSCB to the new MCPM backend abstraction
    ARM: vexpress: migrate DCSCB to the new MCPM backend abstraction
    ARM: vexpress: DCSCB: tighten CPU validity assertion
    ARM: vexpress: migrate TC2 to the new MCPM backend abstraction
    ARM: MCPM: move the algorithmic complexity to the core code
    ARM: EXYNOS: allow cpuidle driver usage on Exynos3250 SoC
    ARM: EXYNOS: add AFTR mode support for Exynos3250
    ARM: EXYNOS: add code for setting/clearing boot flag
    ARM: EXYNOS: fix CPU1 hotplug on Exynos3250
    ARM: S3C64XX: Use fixed IRQ bases to avoid conflicts on Cragganmore
    ARM: cygnus: fix const declaration bcm_cygnus_dt_compat
    ARM: DRA7: hwmod: Fix the hwmod class for GPTimer4
    ARM: DRA7: hwmod: Add data for GPTimers 13 through 16
    ARM: EXYNOS: Remove left over 'extra_save'
    ARM: EXYNOS: Constify exynos_pm_data array
    ARM: EXYNOS: use static in suspend.c
    ARM: EXYNOS: Use platform device name as power domain name
    ARM: EXYNOS: add support for async-bridge clocks for pm_domains
    ARM: omap-device: add missed callback for suspend-to-disk
    ...

    Linus Torvalds
     
  • Pull ARM SoC cleanups from Olof Johansson:
    "We've got a fairly large cleanup branch this time. The bulk of this
    is removal of non-DT platforms of several flavors:

    - Atmel at91 platforms go full-DT, with removal of remaining
    board-file based support

    - OMAP removes legacy board files for three more platforms

    - removal of non-DT mach-msm, newer Qualcomm platforms now live in
    mach-qcom

    - Freescale i.MX25 also removes non-DT platform support"

    Most of the rest of the changes here are fallout from the above, i.e. for
    example removal of drivers that now lack platforms, etc.

    * tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (58 commits)
    mmc: Remove msm_sdcc driver
    gpio: Remove gpio-msm-v1 driver
    ARM: Remove mach-msm and associated ARM architecture code
    ARM: shmobile: cpuidle: Remove the pointless default driver
    ARM: davinci: dm646x: Add interrupt resource for McASPs
    ARM: davinci: irqs: Correct McASP1 TX interrupt definition for DM646x
    ARM: davinci: dm646x: Clean up the McASP DMA resources
    ARM: davinci: devices-da8xx: Add support for McASP2 on da830
    ARM: davinci: devices-da8xx: Clean up and correct the McASP device creation
    ARM: davinci: devices-da8xx: Add interrupt resource to McASP structs
    ARM: davinci: devices-da8xx: Add resource name for the McASP DMA request
    ARM: OMAP2+: Remove legacy support for omap3 TouchBook
    ARM: OMAP3: Remove legacy support for devkit8000
    ARM: OMAP3: Remove legacy support for EMA-Tech Stalker board
    ARM: shmobile: Consolidate the pm code for R-Car Gen2
    ARM: shmobile: r8a7791: Correct SYSCIER value
    ARM: shmobile: r8a7790: Correct SYSCIER value
    ARM: at91: remove old setup
    ARM: at91: sama5d4: remove useless map_io
    ARM: at91: sama5 use SoC detection infrastructure
    ...

    Linus Torvalds
     
  • Pull ARM SoC fixes from Olof Johansson:
    "Here's the usual "low-priority fixes that didn't make it into the last
    few -rcs, with a twist: We had a fixes pull request that I didn't send
    in time to get into 4.0, so we'll send some of them to Greg for
    -stable as well.

    Contents here is as usual not all that controversial:

    - a handful of randconfig fixes from Arnd, in particular for older
    Samsung platforms

    - Exynos fixes, !SMP building, DTS updates for MMC and lid switch

    - Kbuild fix to create output subdirectory for DTB files

    - misc minor fixes for OMAP"

    * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (23 commits)
    ARM: at91/dt: sama5d3 xplained: add phy address for macb1
    kbuild: Create directory for target DTB
    ARM: mvebu: Disable CPU Idle on Armada 38x
    ARM: DRA7: Enable Cortex A15 errata 798181
    ARM: dts: am57xx-beagle-x15: Add thermal map to include fan and tmp102
    ARM: dts: DRA7: Add bandgap and related thermal nodes
    bus: ocp2scp: SYNC2 value should be changed to 0x6
    ARM: dts: am4372: Add "ti,am437x-ocp2scp" as compatible string for OCP2SCP
    ARM: OMAP2+: remove superfluous NULL pointer check
    ARM: EXYNOS: Fix build breakage cpuidle on !SMP
    ARM: dts: fix lid and power pin-functions for exynos5250-spring
    ARM: dts: fix mmc node updates for exynos5250-spring
    ARM: OMAP4: remove dead kconfig option OMAP4_ERRATA_I688
    MAINTAINERS: add OMAP defconfigs under OMAP SUPPORT
    ARM: OMAP1: PM: fix some build warnings on 1510-only Kconfigs
    ARM: cns3xxx: don't export static symbol
    ARM: S3C24XX: avoid a Kconfig warning
    ARM: S3C24XX: fix header file inclusions
    ARM: S3C24XX: fix building without PM_SLEEP
    ARM: S3C24XX: use SAMSUNG_WAKEMASK for s3c2416
    ...

    Linus Torvalds
     

22 Apr, 2015

5 commits

  • Email to Mohit Kumar has been bouncing, so remove the
    address from MAINTAINERS and add an entry in CREDITS.

    Signed-off-by: Bjorn Helgaas

    Bjorn Helgaas
     
  • Pull more input subsystem updates from Dmitry Torokhov:

    - an update to Atmel MXT driver that makes it functional on Google
    Pixel 2 boxes (both touchpad and touchscreen)

    - a new VMware VMMouse driver that should allow us drop X vmmouse
    driver that requires root privileges (since it accesses ioports)

    - XBox One controllers now support force feedback (rumble)

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
    Input: lm8333 - fix broken email address
    Input: cyapa - fix setting suspend scan rate
    Input: elan_i2c - fix calculating number of x and y traces.
    Input: elan_i2c - report hovering contacts
    Input: elants_i2c - zero-extend hardware ID in firmware name
    Input: alps - document separate pointstick button bits for V2 devices
    Input: atmel_mxt_ts - add support for Google Pixel 2
    Input: xpad - add rumble support for Xbox One controller
    Input: ff-core - use new debug macros
    Input: add vmmouse driver
    Input: elan_i2c - adjust for newer firmware pressure reporting

    Linus Torvalds
     
  • Pull media updates from Mauro Carvalho Chehab:

    - a new frontend driver for new ATSC devices: lgdt3306a

    - a new sensor driver: ov2659

    - a new platform driver: xilinx

    - the m88ts2022 tuner driver was merged at ts2020 driver

    - the media controller gained experimental support for DVB and hybrid
    devices

    - lots of random cleanups, fixes and improvements on media drivers

    * tag 'media/v4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (404 commits)
    [media] uvcvideo: add support for VIDIOC_QUERY_EXT_CTRL
    [media] uvcvideo: fix cropcap v4l2-compliance failure
    [media] media: omap3isp: remove unused clkdev
    [media] coda: Add tracing support
    [media] coda: drop dma_sync_single_for_device in coda_bitstream_queue
    [media] coda: fix fill bitstream errors in nonstreaming case
    [media] coda: call SEQ_END when the first queue is stopped
    [media] coda: fail to start streaming if userspace set invalid formats
    [media] coda: remove duplicate error messages for buffer allocations
    [media] coda: move parameter buffer in together with context buffer allocation
    [media] coda: allocate bitstream buffer from REQBUFS, size depends on the format
    [media] coda: allocate per-context buffers from REQBUFS
    [media] coda: use strlcpy instead of snprintf
    [media] coda: bitstream payload is unsigned
    [media] coda: fix double call to debugfs_remove
    [media] coda: check kasprintf return value in coda_open
    [media] coda: bitrate can only be set in kbps steps
    [media] v4l2-mem2mem: no need to initialize b in v4l2_m2m_next_buf and v4l2_m2m_buf_remove
    [media] s5p-mfc: set allow_zero_bytesused flag for vb2_queue_init
    [media] coda: set allow_zero_bytesused flag for vb2_queue_init
    ...

    Linus Torvalds
     
  • Pull char/misc driver updates from Greg KH:
    "Here's the big char/misc driver patchset for 4.1-rc1.

    Lots of different driver subsystem updates here, nothing major, full
    details are in the shortlog.

    All of this has been in linux-next for a while"

    * tag 'char-misc-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (133 commits)
    mei: trace: remove unused TRACE_SYSTEM_STRING
    DTS: ARM: OMAP3-N900: Add lis3lv02d support
    Documentation: DT: lis302: update wakeup binding
    lis3lv02d: DT: add wakeup unit 2 and wakeup threshold
    lis3lv02d: DT: use s32 to support negative values
    Drivers: hv: hv_balloon: correctly handle num_pages>INT_MAX case
    Drivers: hv: hv_balloon: correctly handle val.freeram directory
    coresight-tmc: Adding a status interface to sysfs
    coresight: remove the unnecessary configuration coresight-default-sink
    ...

    Linus Torvalds
     
  • Pull clock framework updates from Michael Turquette:
    "The changes to the common clock framework for 4.0 are mostly new clock
    drivers and updates to existing ones for feature enhancements and bug
    fixes.

    There is more churn than usual in the framework core due to the change
    to introduce per-user unique struct clk pointers in 4.0. This caused
    several regressions to surface, some of which were sent as fixes to
    4.0. New generic clock drivers were added for GPIO- and PWM-based
    clock controllers.

    Additionally the common clk-divider code recieved several fixes to the
    way it rounds rates"

    * tag 'clk-for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (91 commits)
    clk: check ->determine/round_rate() return value in clk_calc_new_rates
    clk: at91: usb: propagate rate modification to the parent clk
    clk: samsung: exynos4: Disable ARMCLK down feature on Exynos4210 SoC
    clk: don't use __initconst for non-const arrays
    clk: at91: change to using endian agnositc IO
    clk: clk-gpio-gate: Fix active low
    clk: Add PWM clock driver
    clk: Add clock driver for mb86s7x
    clk: pxa: pxa3xx: add missing os timer clock
    clk: tegra: Use the proper parent for plld_dsi
    clk: tegra: Use generic tegra_osc_clk_init() on Tegra114
    clk: tegra: Model oscillator as clock
    clk: tegra: Add peripheral registers for bank Y
    clk: tegra: Register the proper number of resets
    clk: tegra: Remove needless initializations
    clk: tegra: Use consistent indentation
    clk: tegra: Various whitespace cleanups
    clk: tegra: Enable HDA to HDMI clocks on Tegra124
    clk: tegra: Fix a bunch of sparse warnings
    clk: tegra: Fix typo tabel -> table
    ...

    Linus Torvalds
     

21 Apr, 2015

1 commit

  • * 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux: (9717 commits)
    media-bus: Fixup RGB444_1X12, RGB565_1X16, and YUV8_1X24 media bus format
    hexdump: avoid warning in test function
    fs: take i_mutex during prepare_binprm for set[ug]id executables
    smp: Fix error case handling in smp_call_function_*()
    iommu-common: Fix PARISC compile-time warnings
    sparc: Make LDC use common iommu poll management functions
    sparc: Make sparc64 use scalable lib/iommu-common.c functions
    Break up monolithic iommu table/lock into finer graularity pools and lock
    sparc: Revert generic IOMMU allocator.
    tools/power turbostat: correct dumped pkg-cstate-limit value
    tools/power turbostat: calculate TSC frequency from CPUID(0x15) on SKL
    tools/power turbostat: correct DRAM RAPL units on recent Xeon processors
    tools/power turbostat: Initial Skylake support
    tools/power turbostat: Use $(CURDIR) instead of $(PWD) and add support for O= option in Makefile
    tools/power turbostat: modprobe msr, if needed
    tools/power turbostat: dump MSR_TURBO_RATIO_LIMIT2
    tools/power turbostat: use new MSR_TURBO_RATIO_LIMIT names
    Bluetooth: hidp: Fix regression with older userspace and flags validation
    config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected
    perf/x86/intel/pt: Fix and clean up error handling in pt_event_add()
    ...

    That solves several merge conflicts:
    Documentation/DocBook/media/v4l/subdev-formats.xml
    Documentation/devicetree/bindings/vendor-prefixes.txt
    drivers/staging/media/mn88473/mn88473.c
    include/linux/kconfig.h
    include/uapi/linux/media-bus-format.h

    The ones at subdev-formats.xml and media-bus-format.h are not trivial.
    That's why we opted to merge from DRM.

    Mauro Carvalho Chehab
     

20 Apr, 2015

2 commits

  • Merge a set of fixes that we missed sending in before v4.0 release. These
    will also be sent to -stable.

    * fixes: (659 commits)
    ARM: at91/dt: sama5d3 xplained: add phy address for macb1
    kbuild: Create directory for target DTB
    ARM: mvebu: Disable CPU Idle on Armada 38x
    arm64: juno: Fix misleading name of UART reference clock
    ARM: dts: sunxi: Remove overclocked/overvoltaged OPP
    ARM: dts: sun4i: a10-lime: Override and remove 1008MHz OPP setting
    ARM: socfpga: dts: fix spi1 interrupt
    ARM: dts: Fix gpio interrupts for dm816x
    ARM: dts: dra7: remove ti,hwmod property from pcie phy
    ARM: EXYNOS: Fix build breakage cpuidle on !SMP
    ARM: OMAP: dmtimer: disable pm runtime on remove
    ARM: OMAP: dmtimer: check for pm_runtime_get_sync() failure
    ARM: dts: fix lid and power pin-functions for exynos5250-spring
    ARM: dts: fix mmc node updates for exynos5250-spring
    ARM: OMAP2+: Fix socbus family info for AM33xx devices
    ARM: dts: omap3: Add missing dmas for crypto
    + Linux 4.0-rc4

    Signed-off-by: Olof Johansson

    Olof Johansson
     
  • The merge is clean, but the arm build fails afterwards,
    due to API changes in the regulator tree.

    I've included the patch into the merge to fix the build.

    Signed-off-by: Dave Airlie

    Dave Airlie
     

18 Apr, 2015

4 commits

  • Pull PMEM driver from Ingo Molnar:
    "This is the initial support for the pmem block device driver:
    persistent non-volatile memory space mapped into the system's physical
    memory space as large physical memory regions.

    The driver is based on Intel code, written by Ross Zwisler, with fixes
    by Boaz Harrosh, integrated with x86 e820 memory resource management
    and tidied up by Christoph Hellwig.

    Note that there were two other separate pmem driver submissions to
    lkml: but apparently all parties (Ross Zwisler, Boaz Harrosh) are
    reasonably happy with this initial version.

    This version enables minimal support that enables persistent memory
    devices out in the wild to work as block devices, identified through a
    magic (non-standard) e820 flag and auto-discovered if
    CONFIG_X86_PMEM_LEGACY=y, or added explicitly through manipulating the
    memory maps via the "memmap=..." boot option with the new, special '!'
    modifier character.

    Limitations: this is a regular block device, and since the pmem areas
    are not struct page backed, they are invisible to the rest of the
    system (other than the block IO device), so direct IO to/from pmem
    areas, direct mmap() or XIP is not possible yet. The page cache will
    also shadow and double buffer pmem contents, etc.

    Initial support is for x86"

    * 'x86-pmem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    drivers/block/pmem: Fix 32-bit build warning in pmem_alloc()
    drivers/block/pmem: Add a driver for persistent memory
    x86/mm: Add support for the non-standard protected e820 type

    Linus Torvalds
     
  • Pull documentation updates from Jonathan Corbet:
    "Numerous fixes, the overdue removal of the i2o docs, some new Chinese
    translations, and, hopefully, the README fix that will end the flow of
    identical patches to that file"

    * tag 'docs-for-linus' of git://git.lwn.net/linux-2.6: (34 commits)
    Documentation/memcg: update memcg/kmem status
    Documentation: blackfin: Makefile: Typo building issue
    Documentation/vm/pagemap.txt: correct location of page-types tool
    Documentation/memory-barriers.txt: typo fix
    doc: Add guest_nice column to example output of `cat /proc/stat'
    Documentation/kernel-parameters: Move "eagerfpu" to its right place
    Documentation: gpio: Update ACPI part of the document to mention _DSD
    docs/completion.txt: Various tweaks and corrections
    doc: completion: context, scope and language fixes
    Documentation:Update Documentation/zh_CN/arm64/memory.txt
    Documentation:Update Documentation/zh_CN/arm64/booting.txt
    Documentation: Chinese translation of arm64/legacy_instructions.txt
    DocBook media: fix broken EIA hyperlink
    Documentation: tweak the maintainers entry
    README: Change gzip/bzip2 to xz compression format
    README: Update version number reference
    doc:pci: Fix typo in Documentation/PCI
    Documentation: drm: Use '->' when describing access through pointers.
    Documentation: Remove mentioning of block barriers
    Documentation/email-clients.txt: Fix one grammar mistake, add extra info about TB
    ...

    Linus Torvalds
     
  • Pull devicetree changes from Grant Likely:
    "Here are the devicetree changes queued up for v4.1. Nothing really
    exciting here. Rob has another few commits for big-endian attached
    UARTs, but those will be sent in a separate merge request since they
    haven't been as thoroughly tested as this batch.

    Here are the highlights:

    - lots of unittest cleanup from Frank Rowand

    - bugfixes and updates to the of_graph code

    - tighten up of_get_mac_address() code

    - documentation updates"

    * tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux:
    of/unittest: Fix of_platform_depopulate test case
    of/unittest: early return from test skips tests
    of/unittest: breadcrumbs to reduce pain of future maintainers
    of/unittest: reduce checkpatch noise - line after declarations
    of/unittest: typo in error string
    of/unittest: add const where needed
    of_net: factor out repetitive code from of_get_mac_address()
    drivers/of: Add empty ranges quirk for PA-Semi
    of: Allow selection of OF_DYNAMIC and OF_OVERLAY if OF_UNITTEST
    of: Empty node & property flag accessors when !OF
    of: Explicitly include linux/types.h in of_graph.h
    dt-bindings: brcm: rationalize Broadcom documentation naming
    of/unittest: replace 'selftest' with 'unittest'
    Documentation: rename of_selftest.txt to of_unittest.txt
    Documentation: update the of_selftest.txt
    dt: OF_UNITTEST make dependency broken
    MAINTAINERS: Pantelis Antoniou device tree overlay maintainer
    of: Add of_graph_get_port_by_id function
    of: Add for_each_endpoint_of_node helper macro
    of: Decrement refcount of previous endpoint in of_graph_get_next_endpoint

    Linus Torvalds
     
  • Pull GPIO updates from Linus Walleij:
    "This is the bulk of GPIO changes for the v4.1 development cycle:

    - A new GPIO hogging mechanism has been added. This can be used on
    boards that want to drive some GPIO line high, low, or set it as
    input on boot and then never touch it again. For some embedded
    systems this is bliss and simplifies things to a great extent.

    - Some API cleanup and closure: gpiod_get_array() and
    gpiod_put_array() has been added to get and put GPIOs in bulk as
    was possible with the non-descriptor API.

    - Encapsulate cross-calls to the pin control subsystem in
    . Now this should be the only header any GPIO
    driver needs to include or something is wrong. Cleanups
    restricting drivers to this include are welcomed if tested.

    - Sort the GPIO Kconfig and split it into submenus, as it was
    becoming and unstructured, illogical and unnavigatable mess. I
    hope this is easier to follow. Menus that require a certain
    subsystem like I2C can now be hidden nicely for example, still
    working on others.

    - New drivers:

    - New driver for the Altera Soft GPIO.

    - The F7188x driver now handles the F71869 and F71869A variants.

    - The MIPS Loongson driver has been moved to drivers/gpio for
    consolidation and cleanup.

    - Cleanups:

    - The MAX732x is converted to use the GPIOLIB_IRQCHIP
    infrastructure.

    - The PCF857x is converted to use the GPIOLIB_IRQCHIP
    infrastructure.

    - Radical cleanup of the OMAP driver.

    - Misc:

    - Enable the DWAPB GPIO for all architectures. This is a "hard
    IP" block from Synopsys which has started to turn up in so
    diverse architectures as X86 Quark, ARC and a slew of ARM
    systems. So even though it's not an expander, it's generic
    enough to be available for all.

    - We add a mock GPIO on Crystalcove PMIC after a long discussion
    with Daniel Vetter et al, tracing back to the shootout at the
    kernel summit where DRM drivers and sub-componentization was
    discussed. In this case a mock GPIO is assumed to be the best
    compromise gaining some reuse of infrastructure without making
    DRM drivers overly complex at the same time. Let's see"

    * tag 'gpio-v4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (62 commits)
    Revert "gpio: sch: use uapi/linux/pci_ids.h directly"
    gpio: dwapb: remove dependencies
    gpio: dwapb: enable for ARC
    gpio: removing kfree remove functionality
    gpio: mvebu: Fix mask/unmask managment per irq chip type
    gpio: split GPIO drivers in submenus
    gpio: move MFD GPIO drivers under their own comment
    gpio: move BCM Kona Kconfig option
    gpio: arrange SPI Kconfig symbols alphabetically
    gpio: arrange PCI GPIO controllers alphabetically
    gpio: arrange I2C Kconfig symbols alphabetically
    gpio: arrange Kconfig symbols alphabetically
    gpio: ich: Implement get_direction function
    gpio: use (!foo) instead of (foo == NULL)
    gpio: arizona: drop owner assignment from platform_drivers
    gpio: max7300: remove 'ret' variable
    gpio: use devm_kzalloc
    gpio: sch: use uapi/linux/pci_ids.h directly
    gpio: x-gene: fix devm_ioremap_resource() check
    gpio: loongson: Add Loongson-3A/3B GPIO driver support
    ...

    Linus Torvalds
     

17 Apr, 2015

6 commits

  • Merge third patchbomb from Andrew Morton:

    - various misc things

    - a couple of lib/ optimisations

    - provide DIV_ROUND_CLOSEST_ULL()

    - checkpatch updates

    - rtc tree

    - befs, nilfs2, hfs, hfsplus, fatfs, adfs, affs, bfs

    - ptrace fixes

    - fork() fixes

    - seccomp cleanups

    - more mmap_sem hold time reductions from Davidlohr

    * emailed patches from Andrew Morton : (138 commits)
    proc: show locks in /proc/pid/fdinfo/X
    docs: add missing and new /proc/PID/status file entries, fix typos
    drivers/rtc/rtc-at91rm9200.c: make IO endian agnostic
    Documentation/spi/spidev_test.c: fix warning
    drivers/rtc/rtc-s5m.c: allow usage on device type different than main MFD type
    .gitignore: ignore *.tar
    MAINTAINERS: add Mediatek SoC mailing list
    tomoyo: reduce mmap_sem hold for mm->exe_file
    powerpc/oprofile: reduce mmap_sem hold for exe_file
    oprofile: reduce mmap_sem hold for mm->exe_file
    mips: ip32: add platform data hooks to use DS1685 driver
    lib/Kconfig: fix up HAVE_ARCH_BITREVERSE help text
    x86: switch to using asm-generic for seccomp.h
    sparc: switch to using asm-generic for seccomp.h
    powerpc: switch to using asm-generic for seccomp.h
    parisc: switch to using asm-generic for seccomp.h
    mips: switch to using asm-generic for seccomp.h
    microblaze: use asm-generic for seccomp.h
    arm: use asm-generic for seccomp.h
    seccomp: allow COMPAT sigreturn overrides
    ...

    Linus Torvalds
     
  • Add the new list that Mediatek specific patches should also be
    directed to.

    Signed-off-by: Matthias Brugger
    Cc: Olof Johansson
    Cc: Arnd Bergmann
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Matthias Brugger
     
  • I've noticed that most of the patches for the RTC subsystem are currently
    either taken directly by Andrew or going through another maintainer's
    tree, quite often without an Acked-by or Reviewed-by tag.

    I'd like to propose myself as the RTC subsystem co-maintainer, to mainly
    help Alessandro reviewing incoming patches and maintain a subsystem tree
    to avoid having the RTC patches going through trees when they have no
    particular dependencies.

    Signed-off-by: Alexandre Belloni
    Cc: Alessandro Zummo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Alexandre Belloni
     
  • Pull block driver updates from Jens Axboe:
    "This is the block driver pull request for 4.1. As with the core bits,
    this is a relatively slow round. This pull request contains:

    - Various fixes and cleanups for NVMe, from Alexey Khoroshilov, Chong
    Yuan, myself, Keith Busch, and Murali Iyer.

    - Documentation and code cleanups for nbd from Markus Pargmann.

    - Change of brd maintainer to me, from Ross Zwisler. At least the
    email doesn't bounce anymore then.

    - Two xen-blkback fixes from Tao Chen"

    * 'for-4.1/drivers' of git://git.kernel.dk/linux-block: (23 commits)
    NVMe: Meta data handling through submit io ioctl
    NVMe: Add translation for block limits
    NVMe: Remove check for null
    NVMe: Fix error handling of class_create("nvme")
    xen-blkback: define pr_fmt macro to avoid the duplication of DRV_PFX
    xen-blkback: enlarge the array size of blkback name
    nbd: Return error pointer directly
    nbd: Return error code directly
    nbd: Remove fixme that was already fixed
    nbd: Restructure debugging prints
    nbd: Fix device bytesize type
    nbd: Replace kthread_create with kthread_run
    nbd: Remove kernel internal header
    Documentation: nbd: Add list of module parameters
    Documentation: nbd: Reformat to allow more documentation
    NVMe: increase depth of admin queue
    nvme: Fix PRP list calculation for non-4k system page size
    NVMe: Fix blk-mq hot cpu notification
    NVMe: embedded iod mask cleanup
    NVMe: Freeze admin queue on device failure
    ...

    Linus Torvalds
     
  • As Rafael suggested, docking station driver is maintained along with the
    ACPI core nowadays, so it's better to remove this entry.

    Signed-off-by: Chao Yu
    Signed-off-by: Rafael J. Wysocki

    Chao Yu
     
  • Pull SCSI updates from James Bottomley:
    "This is the usual grab bag of driver updates (lpfc, qla2xxx, storvsc,
    aacraid, ipr) plus an assortment of minor updates. There's also a
    major update to aic1542 which moves the driver into this millenium"

    * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (106 commits)
    change SCSI Maintainer email
    sd, mmc, virtio_blk, string_helpers: fix block size units
    ufs: add support to allow non standard behaviours (quirks)
    ufs-qcom: save controller revision info in internal structure
    qla2xxx: Update driver version to 8.07.00.18-k
    qla2xxx: Restore physical port WWPN only, when port down detected for FA-WWPN port.
    qla2xxx: Fix virtual port configuration, when switch port is disabled/enabled.
    qla2xxx: Prevent multiple firmware dump collection for ISP27XX.
    qla2xxx: Disable Interrupt handshake for ISP27XX.
    qla2xxx: Add debugging info for MBX timeout.
    qla2xxx: Add serdes read/write support for ISP27XX
    qla2xxx: Add udev notification to save fw dump for ISP27XX
    qla2xxx: Add message for sucessful FW dump collected for ISP27XX.
    qla2xxx: Add support to load firmware from file for ISP 26XX/27XX.
    qla2xxx: Fix beacon blink for ISP27XX.
    qla2xxx: Increase the wait time for firmware to be ready for P3P.
    qla2xxx: Fix crash due to wrong casting of reg for ISP27XX.
    qla2xxx: Fix warnings reported by static checker.
    lpfc: Update version to 10.5.0.0 for upstream patch set
    lpfc: Update copyright to 2015
    ...

    Linus Torvalds
     

16 Apr, 2015

9 commits

  • Merge second patchbomb from Andrew Morton:

    - the rest of MM

    - various misc bits

    - add ability to run /sbin/reboot at reboot time

    - printk/vsprintf changes

    - fiddle with seq_printf() return value

    * akpm: (114 commits)
    parisc: remove use of seq_printf return value
    lru_cache: remove use of seq_printf return value
    tracing: remove use of seq_printf return value
    cgroup: remove use of seq_printf return value
    proc: remove use of seq_printf return value
    s390: remove use of seq_printf return value
    cris fasttimer: remove use of seq_printf return value
    cris: remove use of seq_printf return value
    openrisc: remove use of seq_printf return value
    ARM: plat-pxa: remove use of seq_printf return value
    nios2: cpuinfo: remove use of seq_printf return value
    microblaze: mb: remove use of seq_printf return value
    ipc: remove use of seq_printf return value
    rtc: remove use of seq_printf return value
    power: wakeup: remove use of seq_printf return value
    x86: mtrr: if: remove use of seq_printf return value
    linux/bitmap.h: improve BITMAP_{LAST,FIRST}_WORD_MASK
    MAINTAINERS: CREDITS: remove Stefano Brivio from B43
    .mailmap: add Ricardo Ribalda
    CREDITS: add Ricardo Ribalda Delgado
    ...

    Linus Torvalds
     
  • This email address isn't working anymore

    Signed-off-by: Joe Perches
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • Consistently use a single tab after the "specifier:" type.

    Signed-off-by: Joe Perches
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • Create zsmalloc doc which explains design concept and stat information.

    Signed-off-by: Minchan Kim
    Cc: Juneho Choi
    Cc: Gunho Lee
    Cc: Luigi Semenzato
    Cc: Dan Streetman
    Cc: Seth Jennings
    Cc: Nitin Gupta
    Cc: Jerome Marchand
    Cc: Sergey Senozhatsky
    Cc: Joonsoo Kim
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Minchan Kim
     
  • Pull sound updates from Takashi Iwai:
    "There have been major modernization with the standard bus: in ALSA
    sequencer core and HD-audio. Also, HD-audio receives the regmap
    support replacing the in-house cache register cache code. These
    changes shouldn't impact the existing behavior, but rather
    refactoring.

    In addition, HD-audio got the code split to a core library part and
    the "legacy" driver parts. This is a preliminary work for adapting
    the upcoming ASoC HD-audio driver, and the whole transition is still
    work in progress, likely finished in 4.1.

    Along with them, there are many updates in ASoC area as usual, too:
    lots of cleanups, Intel code shuffling, etc.

    Here are some highlights:

    ALSA core:
    - PCM: the audio timestamp / wallclock enhancement
    - PCM: fixes in DPCM management
    - Fixes / cleanups of user-space control element management
    - Sequencer: modernization using the standard bus

    HD-audio:
    - Modernization using the standard bus
    - Regmap support
    - Use standard runtime PM for codec power saving
    - Widget-path based power-saving for IDT, VIA and Realtek codecs
    - Reorganized sysfs entries for each codec object
    - More Dell headset support

    ASoC:
    - Move of jack registration to the card level
    - Lots of ASoC cleanups, mainly moving things from the CODEC level to
    the card level
    - Support for DAPM routes specified by both the machine driver and DT
    - Continuing improvements to rcar
    - pcm512x enhacements
    - Intel platforms updates
    - rt5670 updates / fixes
    - New platforms / devices: some non-DSP Qualcomm platforms, Google's
    Storm platform, Maxmim MAX98925 CODECs and the Ingenic JZ4780 SoC

    Misc:
    - ice1724: Improved ESI W192M support
    - emu10k1: Emu 1010 fixes/enhancement"

    * tag 'sound-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (411 commits)
    ALSA: hda - set GET bit when adding a vendor verb to the codec regmap
    ALSA: hda/realtek - Enable the ALC292 dock fixup on the Thinkpad T450
    ALSA: hda - Fix another race in runtime PM refcounting
    ALSA: hda - Expose codec type sysfs
    ALSA: ctl: fix to handle several elements added by one operation for userspace element
    ASoC: Intel: fix array_size.cocci warnings
    ASoC: n810: Automatically disconnect non-connected pins
    ASoC: n810: Consistently pass the card DAPM context to n810_ext_control()
    ASoC: davinci-evm: Use card DAPM context to access widgets
    ASoC: mop500_ab8500: Use card DAPM context to access widgets
    ASoC: wm1133-ev1: Use card DAPM context to access widgets
    ASoC: atmel: Improve machine driver compile test coverage
    ASoC: atmel: Add dependency to SND_SOC_I2C_AND_SPI where necessary
    ALSA: control: Fix a typo of SNDRV_CTL_ELEM_ACCESS_TLV_* with SNDRV_CTL_TLV_OP_*
    ALSA: usb-audio: Don't attempt to get Microsoft Lifecam Cinema sample rate
    ASoC: rnsd: fix build regression without CONFIG_OF
    ALSA: emu10k1: add toggles for E-mu 1010 optical ports
    ALSA: ctl: fill identical information to return value when adding userspace elements
    ALSA: ctl: fix a bug to return no identical information in info operation for userspace controls
    ALSA: ctl: confirm to return all identical information in 'activate' event
    ...

    Linus Torvalds
     
  • Updating the MAINTAINERS file with ocrdma maintainers and their email ids

    Signed-off-by: Selvin Xavier
    Signed-off-by: Doug Ledford

    Selvin Xavier
     
  • Pull security subsystem updates from James Morris:
    "Highlights for this window:

    - improved AVC hashing for SELinux by John Brooks and Stephen Smalley

    - addition of an unconfined label to Smack

    - Smack documentation update

    - TPM driver updates"

    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (28 commits)
    lsm: copy comm before calling audit_log to avoid race in string printing
    tomoyo: Do not generate empty policy files
    tomoyo: Use if_changed when generating builtin-policy.h
    tomoyo: Use bin2c to generate builtin-policy.h
    selinux: increase avtab max buckets
    selinux: Use a better hash function for avtab
    selinux: convert avtab hash table to flex_array
    selinux: reconcile security_netlbl_secattr_to_sid() and mls_import_netlbl_cat()
    selinux: remove unnecessary pointer reassignment
    Smack: Updates for Smack documentation
    tpm/st33zp24/spi: Add missing device table for spi phy.
    tpm/st33zp24: Add proper wait for ordinal duration in case of irq mode
    smack: Fix gcc warning from unused smack_syslog_lock mutex in smackfs.c
    Smack: Allow an unconfined label in bringup mode
    Smack: getting the Smack security context of keys
    Smack: Assign smack_known_web as default smk_in label for kernel thread's socket
    tpm/tpm_infineon: Use struct dev_pm_ops for power management
    MAINTAINERS: Add Jason as designated reviewer for TPM
    tpm: Update KConfig text to include TPM2.0 FIFO chips
    tpm/st33zp24/dts/st33zp24-spi: Add dts documentation for st33zp24 spi phy
    ...

    Linus Torvalds
     
  • Pull crypto update from Herbert Xu:
    "Here is the crypto update for 4.1:

    New interfaces:
    - user-space interface for AEAD
    - user-space interface for RNG (i.e., pseudo RNG)

    New hashes:
    - ARMv8 SHA1/256
    - ARMv8 AES
    - ARMv8 GHASH
    - ARM assembler and NEON SHA256
    - MIPS OCTEON SHA1/256/512
    - MIPS img-hash SHA1/256 and MD5
    - Power 8 VMX AES/CBC/CTR/GHASH
    - PPC assembler AES, SHA1/256 and MD5
    - Broadcom IPROC RNG driver

    Cleanups/fixes:
    - prevent internal helper algos from being exposed to user-space
    - merge common code from assembly/C SHA implementations
    - misc fixes"

    * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (169 commits)
    crypto: arm - workaround for building with old binutils
    crypto: arm/sha256 - avoid sha256 code on ARMv7-M
    crypto: x86/sha512_ssse3 - move SHA-384/512 SSSE3 implementation to base layer
    crypto: x86/sha256_ssse3 - move SHA-224/256 SSSE3 implementation to base layer
    crypto: x86/sha1_ssse3 - move SHA-1 SSSE3 implementation to base layer
    crypto: arm64/sha2-ce - move SHA-224/256 ARMv8 implementation to base layer
    crypto: arm64/sha1-ce - move SHA-1 ARMv8 implementation to base layer
    crypto: arm/sha2-ce - move SHA-224/256 ARMv8 implementation to base layer
    crypto: arm/sha256 - move SHA-224/256 ASM/NEON implementation to base layer
    crypto: arm/sha1-ce - move SHA-1 ARMv8 implementation to base layer
    crypto: arm/sha1_neon - move SHA-1 NEON implementation to base layer
    crypto: arm/sha1 - move SHA-1 ARM asm implementation to base layer
    crypto: sha512-generic - move to generic glue implementation
    crypto: sha256-generic - move to generic glue implementation
    crypto: sha1-generic - move to generic glue implementation
    crypto: sha512 - implement base layer for SHA-512
    crypto: sha256 - implement base layer for SHA-256
    crypto: sha1 - implement base layer for SHA-1
    crypto: api - remove instance when test failed
    crypto: api - Move alg ref count init to crypto_check_alg
    ...

    Linus Torvalds
     
  • Pull networking updates from David Miller:

    1) Add BQL support to via-rhine, from Tino Reichardt.

    2) Integrate SWITCHDEV layer support into the DSA layer, so DSA drivers
    can support hw switch offloading. From Floria Fainelli.

    3) Allow 'ip address' commands to initiate multicast group join/leave,
    from Madhu Challa.

    4) Many ipv4 FIB lookup optimizations from Alexander Duyck.

    5) Support EBPF in cls_bpf classifier and act_bpf action, from Daniel
    Borkmann.

    6) Remove the ugly compat support in ARP for ugly layers like ax25,
    rose, etc. And use this to clean up the neigh layer, then use it to
    implement MPLS support. All from Eric Biederman.

    7) Support L3 forwarding offloading in switches, from Scott Feldman.

    8) Collapse the LOCAL and MAIN ipv4 FIB tables when possible, to speed
    up route lookups even further. From Alexander Duyck.

    9) Many improvements and bug fixes to the rhashtable implementation,
    from Herbert Xu and Thomas Graf. In particular, in the case where
    an rhashtable user bulk adds a large number of items into an empty
    table, we expand the table much more sanely.

    10) Don't make the tcp_metrics hash table per-namespace, from Eric
    Biederman.

    11) Extend EBPF to access SKB fields, from Alexei Starovoitov.

    12) Split out new connection request sockets so that they can be
    established in the main hash table. Much less false sharing since
    hash lookups go direct to the request sockets instead of having to
    go first to the listener then to the request socks hashed
    underneath. From Eric Dumazet.

    13) Add async I/O support for crytpo AF_ALG sockets, from Tadeusz Struk.

    14) Support stable privacy address generation for RFC7217 in IPV6. From
    Hannes Frederic Sowa.

    15) Hash network namespace into IP frag IDs, also from Hannes Frederic
    Sowa.

    16) Convert PTP get/set methods to use 64-bit time, from Richard
    Cochran.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1816 commits)
    fm10k: Bump driver version to 0.15.2
    fm10k: corrected VF multicast update
    fm10k: mbx_update_max_size does not drop all oversized messages
    fm10k: reset head instead of calling update_max_size
    fm10k: renamed mbx_tx_dropped to mbx_tx_oversized
    fm10k: update xcast mode before synchronizing multicast addresses
    fm10k: start service timer on probe
    fm10k: fix function header comment
    fm10k: comment next_vf_mbx flow
    fm10k: don't handle mailbox events in iov_event path and always process mailbox
    fm10k: use separate workqueue for fm10k driver
    fm10k: Set PF queues to unlimited bandwidth during virtualization
    fm10k: expose tx_timeout_count as an ethtool stat
    fm10k: only increment tx_timeout_count in Tx hang path
    fm10k: remove extraneous "Reset interface" message
    fm10k: separate PF only stats so that VF does not display them
    fm10k: use hw->mac.max_queues for stats
    fm10k: only show actual queues, not the maximum in hardware
    fm10k: allow creation of VLAN on default vid
    fm10k: fix unused warnings
    ...

    Linus Torvalds