1. 06 Mar, 2017 1 commit
  2. 22 Feb, 2017 6 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 81bbef23
      Linus Torvalds authored
      Pull HID fix from Jiri Kosina:
       "Regression fix for HID_RMI-driven synaptics touchpads in
        !CONFIG_HID_RMI cases"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
        HID: rmi: fallback to generic/multitouch if hid-rmi is not built
      81bbef23
    • Linus Torvalds's avatar
      Merge branch 'for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata · 79f4d1d5
      Linus Torvalds authored
      Pull libata updates from Tejun Heo:
      
       - Bartlomiej added pata_falcon
      
       - Christoph is trying to remove use of static 4k buf.  It's still WIP
      
       - config cleanup around HAS_DMA
      
       - other fixes and driver-specific changes
      
      * 'for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: (29 commits)
        ata: pata_of_platform: using of_property_read_u32() helper
        pata_atiixp: Don't use unconnected secondary port on SB600/SB700
        libata-sff: Don't scan disabled ports when checking for legacy mode.
        pata_octeon_cf: remove unused local variables from octeon_cf_set_piomode()
        ahci: qoriq: added ls2088a platforms support
        ahci: qoriq: report error when ecc register address is missing in dts
        ahci: qoriq: added a condition to enable dma coherence
        Revert "libata: switch to dynamic allocation instead of ata_scsi_rbuf"
        ahci: imx: fix building without hwmon or thermal
        ata: add Atari Falcon PATA controller driver
        ata: pass queued command to ->sff_data_xfer method
        ata: allow subsystem to be used on m68k arch
        libata: switch to dynamic allocation instead of ata_scsi_rbuf
        libata: don't call ata_scsi_rbuf_fill for command without a response buffer
        libata: call ->scsi_done from ata_scsi_simulate
        libata: remove the done callback from ata_scsi_args
        libata: move struct ata_scsi_args to libata-scsi.c
        libata: avoid global response buffer in atapi_qc_complete
        libata-eh: Use switch() instead of sparse array for protocol strings
        ata: sata_mv: Convert to devm_ioremap_resource()
        ...
      79f4d1d5
    • Linus Torvalds's avatar
      Merge tag 'dmaengine-4.11-rc1' of git://git.infradead.org/users/vkoul/slave-dma · 97a229f9
      Linus Torvalds authored
      Pull dmaengine updates from Vinod Koul:
       "This time we fairly boring and bit small update.
      
         - Support for Intel iDMA 32-bit hardware
         - deprecate broken support for channel switching in async_tx
         - bunch of updates on stm32-dma
         - Cyclic support for zx dma and making in generic zx dma driver
         - Small updates to bunch of other drivers"
      
      * tag 'dmaengine-4.11-rc1' of git://git.infradead.org/users/vkoul/slave-dma: (29 commits)
        async_tx: deprecate broken support for channel switching
        dmaengine: rcar-dmac: Widen DMA mask to 40 bits
        dmaengine: sun6i: allow build on ARM64 platforms (sun50i)
        dmaengine: Provide a wrapper for memcpy operations
        dmaengine: zx: fix build warning
        dmaengine: dw: we do support Merrifield SoC in PCI mode
        dmaengine: dw: add support of iDMA 32-bit hardware
        dmaengine: dw: introduce register mappings for iDMA 32-bit
        dmaengine: dw: introduce block2bytes() and bytes2block()
        dmaengine: dw: extract dwc_chan_pause() for future use
        dmaengine: dw: replace convert_burst() with one liner
        dmaengine: dw: register IRQ and DMA pool with instance ID
        dmaengine: dw: Fix data corruption in large device to memory transfers
        dmaengine: ste_dma40: indicate granularity on channels
        dmaengine: ste_dma40: indicate directions on channels
        dmaengine: stm32-dma: Add error messages if xlate fails
        dmaengine: dw: pci: remove LPE Audio DMA ID
        dmaengine: stm32-dma: Add max_burst support
        dmaengine: stm32-dma: Add synchronization support
        dmaengine: stm32-dma: Fix residue computation issue in cyclic mode
        ...
      97a229f9
    • Linus Torvalds's avatar
      Merge tag 'media/v4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · ff58d005
      Linus Torvalds authored
      Pull media updates from Mauro Carvalho Chehab:
      
       - new drivers:
             - i.MX6 Video Data Order Adapter's (VDOA)
             - Toshiba et8ek8 5MP sensor
             - STM DELTA multi-format video decoder V4L2 driver
             - SPI connected IR LED
             - Mediatek IR remote receiver
             - ZyDAS ZD1301 DVB USB interface driver
      
       - new RC keymaps
      
       - some very old LIRC drivers got removed from staging
      
       - RC core gained support encoding IR scan codes
      
       - DVB si2168 gained support for DVBv5 statistics
      
       - lirc_sir driver ported to rc-core and promoted from staging
      
       - other bug fixes, board additions and driver improvements
      
      * tag 'media/v4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (230 commits)
        [media] mtk-vcodec: fix build warnings without DEBUG
        [media] zd1301: fix building interface driver without demodulator
        [media] usbtv: add sharpness control
        [media] cxusb: Use a dma capable buffer also for reading
        [media] ttpci: address stringop overflow warning
        [media] dvb-usb-v2: avoid use-after-free
        [media] add Hama Hybrid DVB-T Stick support
        [media] et8ek8: Fix compiler / Coccinelle warnings
        [media] media: fix semicolon.cocci warnings
        [media] media: exynos4-is: add flags to dummy Exynos IS i2c adapter
        [media] v4l: of: check for unique lanes in data-lanes and clock-lanes
        [media] coda/imx-vdoa: constify structs
        [media] st-delta: debug: trace stream/frame information & summary
        [media] st-delta: add mjpeg support
        [media] st-delta: EOS (End Of Stream) support
        [media] st-delta: rpmsg ipc support
        [media] st-delta: add memory allocator helper functions
        [media] st-delta: STiH4xx multi-format video decoder v4l2 driver
        [media] MAINTAINERS: add st-delta driver
        [media] ARM: multi_v7_defconfig: enable STMicroelectronics DELTA Support
        ...
      ff58d005
    • Linus Torvalds's avatar
      Merge tag 'pinctrl-v4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · 5ab35662
      Linus Torvalds authored
      Pull pin control updates from Linus Walleij:
       "Pin control bulk changes for the v4.11 kernel cycle.
      
        Core changes:
      
         - Switch the generic pin config argument from 16 to 24 bits, only use
           8 bits for the configuration type. We might need to encode more
           information about a certain setting than we need to encode
           different generic settings.
      
         - Add a cross-talk API to the pin control GPIO back-end, utilizing
           pinctrl_gpio_set_config() from GPIO drivers that want to set up a
           certain pin configuration in the back-end.
      
           This also includes the .set_config() refactoring of the GPIO chips,
           so that they pass a generic configuration for things like
           debouncing and single ended (typically open drain). This change has
           also been merged in an immutable branch to the GPIO tree.
      
         - Take hogs with a delayed work, so that we finalize probing a pin
           controller before trying to get any hogs.
      
         - For pin controllers putting all group and function definitions into
           the device tree, we now have generic code to deal with this and it
           is used in two drivers so far.
      
         - Simplifications of the pin request conflict check.
      
         - Make dt_free_map() optional.
      
        Updates to drivers:
      
         - pinctrl-single now use the generic helpers to generate dynamic
           group and function tables from the device tree.
      
         - Texas Instruments IOdelay configuration driver add-on to
           pinctrl-single.
      
         - i.MX: use radix trees to store groups and functions, use the new
           generic group and function helpers to manage them.
      
         - Intel: add support for hardware debouncing and 1K pull-down. New
           subdriver for the Gemini Lake SoC.
      
         - Renesas SH-PFC: drive strength and bias support, CAN bus muxing,
           MSIOF, SDHI, HSCIF for r8a7796. Gyro-ADC supporton r8a7791.
      
         - Aspeed: use syscon cross-dependencies to set up related bits in the
           LPC host controller and display controller.
      
         - Aspeed: finalize G4 and G5 support. Fix mux configuration on GPIOs.
           Add banks Y, Z, AA, AB and AC.
      
         - AMD: support additional GPIO.
      
         - STM32: set this controller to strict muxing mode. STM32H743 MCU
           support.
      
         - Allwinner sunxi: deep simplifications on how to support subvariants
           of SoCs without adding to much SoC-specific data for each
           subvariant, especially for sun5i variants. New driver for V3s SoCs.
           New driver for the H5 SoC. Support A31/A31s variants with the new
           variant framework.
      
         - Mvebu: simplifications to use a MMIO and regmap abstraction. New
           subdrivers for the 98DX3236, 98DX5241 SoCs.
      
         - Samsung Exynos: delete Exynos4415 support. Add crosstalk to the SoC
           driver to access regmaps. Add infrastructure for pin-bank retention
           control. Clean out the pin retention control from
           arch/arm/mach-exynos and arch/arm/mach-s5p and put it properly in
           the Samsung pin control driver(s).
      
         - Meson: add HDMI HPD/DDC pins. Add pwm_ao_b pin.
      
         - Qualcomm: use raw spinlock variants: this makes the qualcomm driver
           realtime-safe"
      
      * tag 'pinctrl-v4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (111 commits)
        pinctrl: samsung: Fix return value check in samsung_pinctrl_get_soc_data()
        pinctrl: intel: unlock on error in intel_config_set_pull()
        pinctrl: berlin: make bool drivers explicitly non-modular
        pinctrl: spear: make bool drivers explicitly non-modular
        pinctrl: mvebu: make bool drivers explicitly non-modular
        pinctrl: sunxi: make sun5i explicitly non-modular
        pinctrl: sunxi: Remove stray printk call in sun5i driver's probe function
        pinctrl: samsung: mark PM functions as __maybe_unused
        pinctrl: sunxi: Remove redundant A31s pinctrl driver
        pinctrl: sunxi: Support A31/A31s with pinctrl variants
        pinctrl: Amend bindings for STM32 pinctrl
        pinctrl: Add STM32 pinctrl driver DT bindings
        pinctrl: stm32: Add STM32H743 MCU support
        include: dt-bindings: Add STM32H7 pinctrl DT defines
        gpio: aspeed: Remove dependence on GPIOF_* macros
        pinctrl: stm32: fix bad location of gpiochip_lock_as_irq
        drivers: pinctrl: add driver for Allwinner H5 SoC
        pinctrl: intel: Add Intel Gemini Lake pin controller support
        pinctrl: intel: Add support for 1k additional pull-down
        pinctrl: intel: Add support for hardware debouncer
        ...
      5ab35662
    • Jiri Kosina's avatar
      HID: rmi: fallback to generic/multitouch if hid-rmi is not built · 2fa299a9
      Jiri Kosina authored
      Commit 279967a6 ("HID: rmi: Handle all Synaptics touchpads using hid-rmi")
      unconditionally switches over handling of all Synaptics touchpads to hid-rmi
      (to make use of extended features of the HW); in case CONFIG_HID_RMI is
      disabled though this renders the touchpad unusable, as the
      
      	HID_DEVICE(HID_BUS_ANY, HID_GROUP_RMI, HID_ANY_ID, HID_ANY_ID)
      
      match doesn't exist and generic/multitouch doesn't bind to it either (due
      to hid group mismatch).
      
      Fix this by switching over to hid-rmi only if it has been actually built.
      
      Fixes: 279967a6 ("HID: rmi: Handle all Synaptics touchpads using hid-rmi")
      Reported-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      Acked-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
      Tested-by: default avatarAndrew Duggan <aduggan@synaptics.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      2fa299a9
  3. 21 Feb, 2017 31 commits
    • Linus Torvalds's avatar
      Merge tag 'extable-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux · 6d1c42d9
      Linus Torvalds authored
      Pull exception table module split from Paul Gortmaker:
       "Final extable.h related changes.
      
        This completes the separation of exception table content from the
        module.h header file. This is achieved with the final commit that
        removes the one line back compatible change that sourced extable.h
        into the module.h file.
      
        The commits are unchanged since January, with the exception of a
        couple Acks that came in for the last two commits a bit later. The
        changes have been in linux-next for quite some time[1] and have got
        widespread arch coverage via toolchains I have and also from
        additional ones the kbuild bot has.
      
        Maintaners of the various arch were Cc'd during the postings to
        lkml[2] and informed that the intention was to take the remaining arch
        specific changes and lump them together with the final two non-arch
        specific changes and submit for this merge window.
      
        The ia64 diffstat stands out and probably warrants a mention. In an
        earlier review, Al Viro made a valid comment that the original header
        separation of content left something to be desired, and that it get
        fixed as a part of this change, hence the larger diffstat"
      
      * tag 'extable-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (21 commits)
        module.h: remove extable.h include now users have migrated
        core: migrate exception table users off module.h and onto extable.h
        cris: migrate exception table users off module.h and onto extable.h
        hexagon: migrate exception table users off module.h and onto extable.h
        microblaze: migrate exception table users off module.h and onto extable.h
        unicore32: migrate exception table users off module.h and onto extable.h
        score: migrate exception table users off module.h and onto extable.h
        metag: migrate exception table users off module.h and onto extable.h
        arc: migrate exception table users off module.h and onto extable.h
        nios2: migrate exception table users off module.h and onto extable.h
        sparc: migrate exception table users onto extable.h
        openrisc: migrate exception table users off module.h and onto extable.h
        frv: migrate exception table users off module.h and onto extable.h
        sh: migrate exception table users off module.h and onto extable.h
        xtensa: migrate exception table users off module.h and onto extable.h
        mn10300: migrate exception table users off module.h and onto extable.h
        alpha: migrate exception table users off module.h and onto extable.h
        arm: migrate exception table users off module.h and onto extable.h
        m32r: migrate exception table users off module.h and onto extable.h
        ia64: ensure exception table search users include extable.h
        ...
      6d1c42d9
    • Linus Torvalds's avatar
      Merge tag 'mips_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips · 0f002fdd
      Linus Torvalds authored
      Pull MIPS updates from James Hogan:
       "Here's the main MIPS pull request for 4.11.
      
        It contains a few new features such as IRQ stacks, cacheinfo support,
        and KASLR for Octeon CPUs, and a variety of smaller improvements and
        fixes including devicetree additions, kexec cleanups, microMIPS stack
        unwinding fixes, and a bunch of build fixes to clean up continuous
        integration builds.
      
        Its all been in linux-next for at least a couple of days, most of it
        far longer.
      
        Miscellaneous:
         - Add IRQ stacks
         - Add cacheinfo support
         - Add "uzImage.bin" zboot target
         - Unify performance counter definitions
         - Export various (mainly assembly) symbols alongside their
           definitions
         - Audit and remove unnecessary uses of module.h
      
        kexec & kdump:
         - Lots of improvements and fixes
         - Add correct copy_regs implementations
         - Add debug logging of new kernel information
      
        Security:
         - Use Makefile.postlink to insert relocations into vmlinux
         - Provide plat_post_relocation hook (used for Octeon KASLR)
         - Add support for tuning mmap randomisation
         - Relocate DTB
      
        microMIPS:
         - A load of unwind fixes
         - Add some missing .insn to fix link errors
      
        MIPSr6:
         - Fix MULTU/MADDU/MSUBU sign extension in r2 emulation
         - Remove r2_emul_return and use ERETNC unconditionally on MIPSr6
         - Allow pre-r6 emulation on SMP MIPSr6 kernels
      
        Cache management:
         - Treat physically indexed dcache as non-aliasing
         - Add return errors to protected cache ops for KVM
         - CM3: Ensure L1 & L2 cache ECC checking matches
         - CM3: Indicate inclusive caches
         - I6400: Treat dcache as physically indexed
      
        Memory management:
         - Ensure bootmem doesn't corrupt reserved memory
         - Export some TLB exception generation functions for KVM
      
        OF:
         - NULL check initial_boot_params before use in of_scan_flat_dt()
         - Fix unaligned access in of_alias_scan()
      
        SMP:
         - CPS: Don't BUG if a CPU fails to start
      
        Other fixes:
         - Fix longstanding 64-bit IP checksum carry bug
         - Fix KERN_CONT fallout in cpu-bugs64.c and sync-r4k.c
         - Update defconfigs for NF_CT_PROTO_DCCP, DPLITE,
           CPU_FREQ_STAT,SCSI_DH changes
         - Disable certain builtin compiler options, stack-check (whole
           kernel), asynchronous-unwind-tables (VDSO).
         - A bunch of build fixes from kernelci.org testing
         - Various other minor cleanups & corrections
      
        BMIPS:
         - Migrate interrupts during bmips_cpu_disable
         - BCM47xx: Add Luxul devices
         - BCM47xx: Fix Asus WL-500W button inversion
         - BCM7xxx: Add SPI device nodes
      
        Generic (multiplatform):
         - Add kexec DTB passing
         - Fix big endian
         - Add cpp_its_S in ksym_dep_filter to silence build warning
      
        IP22:
         - Reformat inline assembler code to modern standards
         - Fix binutils 2.25 build error
      
        IP27:
         - Fix duplicate CAC_BASE definition build error
         - Disable qlge driver to workaround broken compiler
      
        Lantiq:
         - Refresh defconfig and activate more drivers
         - Lock DMA register access
         - Fix cascading IRQ setup
         - Fix build of VPE loader
         - xway: Fix ethernet packet header corruption over reboot
      
        Loongson1
         - Add watchdog support
         - 1B: Reduce DEFAULT_MEMSIZE to 64MB
         - 1B: Change OSC clock name to match rest of kernel
         - 1C: Remove ARCH_WANT_OPTIONAL_GPIOLIB
      
        Octeon:
         - Add KASLR support
         - Support Octeon III USB controller
         - Fix large copy_from_user corner case
         - Enable devtmpfs in defconfig
      
        Netlogic:
         - Fix non-default XLR build error due to netlogic,xlp-pic code
         - Fix assembler warning from smpboot.S
      
        pic32mzda:
         - Fix linker error when early printk is disabled
      
        Pistachio:
         - Add base device tree
         - Add Ci40 "Marduk" device tree
      
        Ralink:
         - Support raw appended DTB
         - Add missing I2C & I2S clocks
         - Add missing pinmux and fix pinmux function name typo
         - Add missing clk_round_rate()
         - Clean up prom_init()
         - MT7621: Set SoC type
         - MT7621: Support highmem
      
        TXx9:
         - Modernize printing of kernel messages and resolve KERN_CONT fallout
         - 7segled: use permission-specific DEVICE_ATTR variants
      
        XilFPGA:
         - Add IRQ controller and UART IRQ
         - Add AXI I2C and emaclite to DT & defconfig"
      
      * tag 'mips_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips: (148 commits)
        MIPS: VDSO: Explicitly use -fno-asynchronous-unwind-tables
        MIPS: BCM47XX: Fix button inversion for Asus WL-500W
        MIPS: DTS: Add img directory to Makefile
        MIPS: ip27: Disable qlge driver in defconfig
        MIPS: pic32mzda: Fix linker error for pic32_get_pbclk()
        MIPS: Lantiq: Keep ethernet enabled during boot
        MIPS: OCTEON: Fix copy_from_user fault handling for large buffers
        MIPS: Fix special case in 64 bit IP checksumming.
        MIPS: OCTEON: Enable DEVTMPFS
        MIPS: lantiq: Set physical_memsize
        MIPS: sysmips: Remove duplicated include from syscall.c
        Kbuild: Add cpp_its_S in ksym_dep_filter
        MIPS: Audit and remove any unnecessary uses of module.h
        MIPS: Unify perf counter register definitions
        MIPS: Disable stack checks on MIPS kernels
        MIPS: OCTEON: Platform support for OCTEON III USB controller
        MIPS: Lantiq: Fix cascaded IRQ setup
        MIPS: sync-r4k: Fix KERN_CONT fallout
        MIPS: IRQ Stack: Fix erroneous jal to plat_irq_dispatch
        MIPS: Fix distclean with Makefile.postlink
        ...
      0f002fdd
    • Linus Torvalds's avatar
      Merge tag 'for-linus-4.11-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 252b95c0
      Linus Torvalds authored
      Pull xen updates from Juergen Gross:
       "Xen features and fixes:
      
         - a series from Boris Ostrovsky adding support for booting Linux as
           Xen PVH guest
      
         - a series from Juergen Gross streamlining the xenbus driver
      
         - a series from Paul Durrant adding support for the new device model
           hypercall
      
         - several small corrections"
      
      * tag 'for-linus-4.11-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        xen/privcmd: add IOCTL_PRIVCMD_RESTRICT
        xen/privcmd: Add IOCTL_PRIVCMD_DM_OP
        xen/privcmd: return -ENOTTY for unimplemented IOCTLs
        xen: optimize xenbus driver for multiple concurrent xenstore accesses
        xen: modify xenstore watch event interface
        xen: clean up xenbus internal headers
        xenbus: Neaten xenbus_va_dev_error
        xen/pvh: Use Xen's emergency_restart op for PVH guests
        xen/pvh: Enable CPU hotplug
        xen/pvh: PVH guests always have PV devices
        xen/pvh: Initialize grant table for PVH guests
        xen/pvh: Make sure we don't use ACPI_IRQ_MODEL_PIC for SCI
        xen/pvh: Bootstrap PVH guest
        xen/pvh: Import PVH-related Xen public interfaces
        xen/x86: Remove PVH support
        x86/boot/32: Convert the 32-bit pgtable setup code from assembly to C
        xen/manage: correct return value check on xenbus_scanf()
        x86/xen: Fix APIC id mismatch warning on Intel
        xen/netback: set default upper limit of tx/rx queues to 8
        xen/netfront: set default upper limit of tx/rx queues to 8
      252b95c0
    • Linus Torvalds's avatar
      Merge branch 'stable-4.11' of git://git.infradead.org/users/pcmoore/audit · b8989bcc
      Linus Torvalds authored
      Pull audit updates from Paul Moore:
       "The audit changes for v4.11 are relatively small compared to what we
        did for v4.10, both in terms of size and impact.
      
         - two patches from Steve tweak the formatting for some of the audit
           records to make them more consistent with other audit records.
      
         - three patches from Richard record the name of a module on module
           load, fix the logging of sockaddr information when using
           socketcall() on 32-bit systems, and add the ability to reset
           audit's lost record counter.
      
         - my lone patch just fixes an annoying style nit that I was reminded
           about by one of Richard's patches.
      
        All these patches pass our test suite"
      
      * 'stable-4.11' of git://git.infradead.org/users/pcmoore/audit:
        audit: remove unnecessary curly braces from switch/case statements
        audit: log module name on init_module
        audit: log 32-bit socketcalls
        audit: add feature audit_lost reset
        audit: Make AUDIT_ANOM_ABEND event normalized
        audit: Make AUDIT_KERNEL event conform to the specification
      b8989bcc
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · c9341ee0
      Linus Torvalds authored
      Pull security layer updates from James Morris:
       "Highlights:
      
         - major AppArmor update: policy namespaces & lots of fixes
      
         - add /sys/kernel/security/lsm node for easy detection of loaded LSMs
      
         - SELinux cgroupfs labeling support
      
         - SELinux context mounts on tmpfs, ramfs, devpts within user
           namespaces
      
         - improved TPM 2.0 support"
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (117 commits)
        tpm: declare tpm2_get_pcr_allocation() as static
        tpm: Fix expected number of response bytes of TPM1.2 PCR Extend
        tpm xen: drop unneeded chip variable
        tpm: fix misspelled "facilitate" in module parameter description
        tpm_tis: fix the error handling of init_tis()
        KEYS: Use memzero_explicit() for secret data
        KEYS: Fix an error code in request_master_key()
        sign-file: fix build error in sign-file.c with libressl
        selinux: allow changing labels for cgroupfs
        selinux: fix off-by-one in setprocattr
        tpm: silence an array overflow warning
        tpm: fix the type of owned field in cap_t
        tpm: add securityfs support for TPM 2.0 firmware event log
        tpm: enhance read_log_of() to support Physical TPM event log
        tpm: enhance TPM 2.0 PCR extend to support multiple banks
        tpm: implement TPM 2.0 capability to get active PCR banks
        tpm: fix RC value check in tpm2_seal_trusted
        tpm_tis: fix iTPM probe via probe_itpm() function
        tpm: Begin the process to deprecate user_read_timer
        tpm: remove tpm_read_index and tpm_write_index from tpm.h
        ...
      c9341ee0
    • Linus Torvalds's avatar
      Merge tag 'dm-4.11-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm · 7a771cea
      Linus Torvalds authored
      Pull device mapper updates from Mike Snitzer:
      
       - Fix dm-raid transient device failure processing and other smaller
         tweaks.
      
       - Add journal support to the DM raid target to close the 'write hole'
         on raid 4/5/6.
      
       - Fix dm-cache corruption, due to rounding bug, when cache exceeds 2TB.
      
       - Add 'metadata2' feature to dm-cache to separate the dirty bitset out
         from other cache metadata. This improves speed of shutting down a
         large cache device (which implies writing out dirty bits).
      
       - Fix a memory leak during dm-stats data structure destruction.
      
       - Fix a DM multipath round-robin path selector performance regression
         that was caused by less precise balancing across all paths.
      
       - Lastly, introduce a DM core fix for a long-standing DM snapshot
         deadlock that is rooted in the complexity of the device stack used in
         conjunction with block core maintaining bios on current->bio_list to
         manage recursion in generic_make_request(). A more comprehensive fix
         to block core (and its hook in the cpu scheduler) would be wonderful
         but this DM-specific fix is pragmatic considering how difficult it
         has been to make progress on a generic fix.
      
      * tag 'dm-4.11-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm: (22 commits)
        dm: flush queued bios when process blocks to avoid deadlock
        dm round robin: revert "use percpu 'repeat_count' and 'current_path'"
        dm stats: fix a leaked s->histogram_boundaries array
        dm space map metadata: constify dm_space_map structures
        dm cache metadata: use cursor api in blocks_are_clean_separate_dirty()
        dm persistent data: add cursor skip functions to the cursor APIs
        dm cache metadata: use dm_bitset_new() to create the dirty bitset in format 2
        dm bitset: add dm_bitset_new()
        dm cache metadata: name the cache block that couldn't be loaded
        dm cache metadata: add "metadata2" feature
        dm cache metadata: use bitset cursor api to load discard bitset
        dm bitset: introduce cursor api
        dm btree: use GFP_NOFS in dm_btree_del()
        dm space map common: memcpy the disk root to ensure it's arch aligned
        dm block manager: add unlikely() annotations on dm_bufio error paths
        dm cache: fix corruption seen when using cache > 2TB
        dm raid: cleanup awkward branching in raid_message() option processing
        dm raid: use mddev rather than rdev->mddev
        dm raid: use read_disk_sb() throughout
        dm raid: add raid4/5/6 journaling support
        ...
      7a771cea
    • Linus Torvalds's avatar
      Merge tag 'mmc-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc · e67bd12d
      Linus Torvalds authored
      Pull MMC updates from Ulf Hansson:
       "MMC core:
         - Add support for Marvell SD8787 Wifi/BT chip
         - Improve UHS support for SDIO
         - Invent MMC_CAP_3_3V_DDR and a DT binding for eMMC DDR 3.3V mode
         - Detect Auto BKOPS enable bit
         - Export eMMC device lifetime information through sysfs
         - First take to slim down the public mmc headers to avoid abuse
         - Re-factoring of the mmc block device driver to prepare for blkmq
         - Cleanup code for the mmc block device driver
         - Clarify and cleanup code dealing with data requests
         - Cleanup some code by converting to ida_simple_ functions
         - Cleanup code dealing with card quirks
         - Cleanup private and public mmc header files
      
        MMC host:
         - Don't rely on public mmc headers to include non-mmc related headers
         - meson: Add support for eMMC HS400 mode
         - meson: Various cleanups and improvements
         - omap_hsmmc: Use the proper provided busy timeout from the core
         - sunxi: Enable new timings for the A64 MMC controllers
         - sunxi: Improvements for clock management
         - tmio: Improvements for SDIO interrupts
         - mxs-mmc: Add CMD23 support
         - sdhci-msm: Enable HS400 enhanced strobe mode support
         - sdhci-msm: Correct HS400 tuning sequence
         - sdhci-acpi: Support deferred probe
         - sdhci-pci: Add support for eMMC HS200 tuning mode on AMD
         - mediatek: Correct the implementation of card busy detection
         - dw_mmc: Initial support for ZX mmc controller
         - sh_mobile_sdhi: Enable support for eMMC HS200 mode
         - sh_mmcif: Various cleanups and improvements"
      
      * tag 'mmc-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: (145 commits)
        mmc: core: add mmc prefix for blk_fixups
        mmc: core: move all quirks together into quirks.h
        mmc: core: improve the quirks for sdio devices
        mmc: core: move some sdio IDs out of quirks file
        mmc: core: change quirks.c to be a header file
        mmc: sdhci-cadence: fix bit shift of read data from PHY port
        mmc: Adding AUTO_BKOPS_EN bit set for Auto BKOPS support
        mmc: MAN_BKOPS_EN inverse debug message logic
        mmc: meson-gx: add support for HS400 mode
        mmc: meson-gx: remove unneeded checks in remove
        mmc: meson-gx: reduce bounce buffer size
        mmc: meson-gx: set max block count and request size
        mmc: meson-gx: improve interrupt handling
        mmc: meson-gx: improve meson_mmc_irq_thread
        mmc: meson-gx: improve meson_mmc_clk_set
        mmc: meson-gx: minor improvements in meson_mmc_set_ios
        mmc: meson: Assign the minimum clk rate as close to 400KHz as possible
        mmc: core: start to break apart mmc_start_areq()
        mmc: block: respect bool returned from blk_end_request()
        mmc: block: return errorcode from mmc_sd_num_wr_blocks()
        ...
      e67bd12d
    • Linus Torvalds's avatar
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · cdc19470
      Linus Torvalds authored
      Pull SCSI updates from James Bottomley:
       "This update includes the usual round of major driver updates (ncr5380,
        ufs, lpfc, be2iscsi, hisi_sas, storvsc, cxlflash, aacraid,
        megaraid_sas, ...).
      
        There's also an assortment of minor fixes and the major update of
        switching a bunch of drivers to pci_alloc_irq_vectors from Christoph"
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (188 commits)
        scsi: megaraid_sas: handle dma_addr_t right on 32-bit
        scsi: megaraid_sas: array overflow in megasas_dump_frame()
        scsi: snic: switch to pci_irq_alloc_vectors
        scsi: megaraid_sas: driver version upgrade
        scsi: megaraid_sas: Change RAID_1_10_RMW_CMDS to RAID_1_PEER_CMDS and set value to 2
        scsi: megaraid_sas: Indentation and smatch warning fixes
        scsi: megaraid_sas: Cleanup VD_EXT_DEBUG and SPAN_DEBUG related debug prints
        scsi: megaraid_sas: Increase internal command pool
        scsi: megaraid_sas: Use synchronize_irq to wait for IRQs to complete
        scsi: megaraid_sas: Bail out the driver load if ld_list_query fails
        scsi: megaraid_sas: Change build_mpt_mfi_pass_thru to return void
        scsi: megaraid_sas: During OCR, if get_ctrl_info fails do not continue with OCR
        scsi: megaraid_sas: Do not set fp_possible if TM capable for non-RW syspdIO, change fp_possible to bool
        scsi: megaraid_sas: Remove unused pd_index from megasas_build_ld_nonrw_fusion
        scsi: megaraid_sas: megasas_return_cmd does not memset IO frame to zero
        scsi: megaraid_sas: max_fw_cmds are decremented twice, remove duplicate
        scsi: megaraid_sas: update can_queue only if the new value is less
        scsi: megaraid_sas: Change max_cmd from u32 to u16 in all functions
        scsi: megaraid_sas: set pd_after_lb from MR_BuildRaidContext and initialize pDevHandle to MR_DEVHANDLE_INVALID
        scsi: megaraid_sas: latest controller OCR capability from FW before sending shutdown DCMD
        ...
      cdc19470
    • Linus Torvalds's avatar
      Merge tag 'for-4.11/linus-merge-signed' of git://git.kernel.dk/linux-block · 772c8f6f
      Linus Torvalds authored
      Pull block layer updates from Jens Axboe:
      
       - blk-mq scheduling framework from me and Omar, with a port of the
         deadline scheduler for this framework. A port of BFQ from Paolo is in
         the works, and should be ready for 4.12.
      
       - Various fixups and improvements to the above scheduling framework
         from Omar, Paolo, Bart, me, others.
      
       - Cleanup of the exported sysfs blk-mq data into debugfs, from Omar.
         This allows us to export more information that helps debug hangs or
         performance issues, without cluttering or abusing the sysfs API.
      
       - Fixes for the sbitmap code, the scalable bitmap code that was
         migrated from blk-mq, from Omar.
      
       - Removal of the BLOCK_PC support in struct request, and refactoring of
         carrying SCSI payloads in the block layer. This cleans up the code
         nicely, and enables us to kill the SCSI specific parts of struct
         request, shrinking it down nicely. From Christoph mainly, with help
         from Hannes.
      
       - Support for ranged discard requests and discard merging, also from
         Christoph.
      
       - Support for OPAL in the block layer, and for NVMe as well. Mainly
         from Scott Bauer, with fixes/updates from various others folks.
      
       - Error code fixup for gdrom from Christophe.
      
       - cciss pci irq allocation cleanup from Christoph.
      
       - Making the cdrom device operations read only, from Kees Cook.
      
       - Fixes for duplicate bdi registrations and bdi/queue life time
         problems from Jan and Dan.
      
       - Set of fixes and updates for lightnvm, from Matias and Javier.
      
       - A few fixes for nbd from Josef, using idr to name devices and a
         workqueue deadlock fix on receive. Also marks Josef as the current
         maintainer of nbd.
      
       - Fix from Josef, overwriting queue settings when the number of
         hardware queues is updated for a blk-mq device.
      
       - NVMe fix from Keith, ensuring that we don't repeatedly mark and IO
         aborted, if we didn't end up aborting it.
      
       - SG gap merging fix from Ming Lei for block.
      
       - Loop fix also from Ming, fixing a race and crash between setting loop
         status and IO.
      
       - Two block race fixes from Tahsin, fixing request list iteration and
         fixing a race between device registration and udev device add
         notifiations.
      
       - Double free fix from cgroup writeback, from Tejun.
      
       - Another double free fix in blkcg, from Hou Tao.
      
       - Partition overflow fix for EFI from Alden Tondettar.
      
      * tag 'for-4.11/linus-merge-signed' of git://git.kernel.dk/linux-block: (156 commits)
        nvme: Check for Security send/recv support before issuing commands.
        block/sed-opal: allocate struct opal_dev dynamically
        block/sed-opal: tone down not supported warnings
        block: don't defer flushes on blk-mq + scheduling
        blk-mq-sched: ask scheduler for work, if we failed dispatching leftovers
        blk-mq: don't special case flush inserts for blk-mq-sched
        blk-mq-sched: don't add flushes to the head of requeue queue
        blk-mq: have blk_mq_dispatch_rq_list() return if we queued IO or not
        block: do not allow updates through sysfs until registration completes
        lightnvm: set default lun range when no luns are specified
        lightnvm: fix off-by-one error on target initialization
        Maintainers: Modify SED list from nvme to block
        Move stack parameters for sed_ioctl to prevent oversized stack with CONFIG_KASAN
        uapi: sed-opal fix IOW for activate lsp to use correct struct
        cdrom: Make device operations read-only
        elevator: fix loading wrong elevator type for blk-mq devices
        cciss: switch to pci_irq_alloc_vectors
        block/loop: fix race between I/O and set_status
        blk-mq-sched: don't hold queue_lock when calling exit_icq
        block: set make_request_fn manually in blk_mq_update_nr_hw_queues
        ...
      772c8f6f
    • Mark Brown's avatar
      sched/core: Fix build paravirt build on arm and arm64 · fd4a61e0
      Mark Brown authored
      Commit 004172bd ("sched/core: Remove unnecessary #include headers")
      removed the inclusion of asm/paravirt.h which is used to get
      declarations of paravirt_steal_rq_enabled and paravirt_steal_clock.
      
      It is implicitly included on x86 but not on arm and arm64 breaking the
      build if paravirtualization is used.  Since things from that header are
      used directly fix the build by putting the direct inclusion back.
      Signed-off-by: default avatarMark Brown <broonie@kernel.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      fd4a61e0
    • Linus Torvalds's avatar
      Merge tag 'gfs2-4.11.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 · 9763dd6f
      Linus Torvalds authored
      Pull GFS2 updates from Robert Peterson:
       "We've got eight GFS2 patches for this merge window:
      
         - Andy Price submitted a patch to make gfs2_write_full_page a static
           function.
      
         - Dan Carpenter submitted a patch to fix a ERR_PTR thinko.
      
        Three patches fix bugs related to deleting very large files, which
        cause GFS2 to run out of journal space:
      
         - The first one prevents GFS2 delete operation from requesting too
           much journal space.
      
         - The second one fixes a problem whereby GFS2 can hang because it
           wasn't taking journal space demand into its calculations.
      
         - The third one wakes up IO waiters when a flush is done to restart
           processes stuck waiting for journal space to become available.
      
        The final three patches are a performance improvement related to
        spin_lock contention between multiple writers:
      
         - The "tr_touched" variable was switched to a flag to be more atomic
           and eliminate the possibility of some races.
      
         - Function meta_lo_add was moved inline with its only caller to make
           the code more readable and efficient.
      
         - Contention on the gfs2_log_lock spinlock was greatly reduced by
           avoiding the lock altogether in cases where we don't really need
           it: buffers that already appear in the appropriate metadata list
           for the journal. Many thanks to Steve Whitehouse for the ideas and
           principles behind these patches"
      
      * tag 'gfs2-4.11.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
        gfs2: Make gfs2_write_full_page static
        GFS2: Reduce contention on gfs2_log_lock
        GFS2: Inline function meta_lo_add
        GFS2: Switch tr_touched to flag in transaction
        GFS2: Wake up io waiters whenever a flush is done
        GFS2: Made logd daemon take into account log demand
        GFS2: Limit number of transaction blocks requested for truncates
        GFS2: Fix reference to ERR_PTR in gfs2_glock_iter_next
      9763dd6f
    • Vinod Koul's avatar
      Merge branch 'topic/zx' into for-linus · 1ad65115
      Vinod Koul authored
      1ad65115
    • Vinod Koul's avatar
      Merge branch 'topic/stm32-dma' into for-linus · 8a3ec583
      Vinod Koul authored
      8a3ec583
    • Vinod Koul's avatar
      Merge branch 'topic/ste' into for-linus · 25036f2a
      Vinod Koul authored
      25036f2a
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · 70fcf5c3
      Linus Torvalds authored
      Pull UDF fixes and cleanups from Jan Kara:
       "Several small UDF fixes and cleanups and a small cleanup of fanotify
        code"
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        fanotify: simplify the code of fanotify_merge
        udf: simplify udf_ioctl()
        udf: fix ioctl errors
        udf: allow implicit blocksize specification during mount
        udf: check partition reference in udf_read_inode()
        udf: atomically read inode size
        udf: merge module informations in super.c
        udf: remove next_epos from udf_update_extent_cache()
        udf: Factor out trimming of crtime
        udf: remove empty condition
        udf: remove unneeded line break
        udf: merge bh free
        udf: use pointer for kernel_long_ad argument
        udf: use __packed instead of __attribute__ ((packed))
        udf: Make stat on symlink report symlink length as st_size
        fs/udf: make #ifdef UDF_PREALLOCATE unconditional
        fs: udf: Replace CURRENT_TIME with current_time()
      70fcf5c3
    • Vinod Koul's avatar
      Merge branch 'topic/intel' into for-linus · e4e48c47
      Vinod Koul authored
      e4e48c47
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 · 2bfe01ef
      Linus Torvalds authored
      Pull CIFS/SMB3 updates from Steve French:
       "Includes support for a critical SMB3 security feature: per-share
        encryption from Pavel, and a cleanup from Jean Delvare.
      
        Will have another cifs/smb3 merge next week"
      
      * 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
        CIFS: Allow to switch on encryption with seal mount option
        CIFS: Add capability to decrypt big read responses
        CIFS: Decrypt and process small encrypted packets
        CIFS: Add copy into pages callback for a read operation
        CIFS: Add mid handle callback
        CIFS: Add transform header handling callbacks
        CIFS: Encrypt SMB3 requests before sending
        CIFS: Enable encryption during session setup phase
        CIFS: Add capability to transform requests before sending
        CIFS: Separate RFC1001 length processing for SMB2 read
        CIFS: Separate SMB2 sync header processing
        CIFS: Send RFC1001 length in a separate iov
        CIFS: Make send_cancel take rqst as argument
        CIFS: Make SendReceive2() takes resp iov
        CIFS: Separate SMB2 header structure
        CIFS: Fix splice read for non-cached files
        cifs: Add soft dependencies
        cifs: Only select the required crypto modules
        cifs: Simplify SMB2 and SMB311 dependencies
      2bfe01ef
    • Linus Torvalds's avatar
      Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · cab7076a
      Linus Torvalds authored
      Pull ext4 updates from Ted Ts'o:
       "For this cycle we add support for the shutdown ioctl, which is
        primarily used for testing, but which can be useful on production
        systems when a scratch volume is being destroyed and the data on it
        doesn't need to be saved.
      
        This found (and we fixed) a number of bugs with ext4's recovery to
        corrupted file system --- the bugs increased the amount of data that
        could be potentially lost, and in the case of the inline data feature,
        could cause the kernel to BUG.
      
        Also included are a number of other bug fixes, including in ext4's
        fscrypt, DAX, inline data support"
      
      * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (26 commits)
        ext4: rename EXT4_IOC_GOINGDOWN to EXT4_IOC_SHUTDOWN
        ext4: fix fencepost in s_first_meta_bg validation
        ext4: don't BUG when truncating encrypted inodes on the orphan list
        ext4: do not use stripe_width if it is not set
        ext4: fix stripe-unaligned allocations
        dax: assert that i_rwsem is held exclusive for writes
        ext4: fix DAX write locking
        ext4: add EXT4_IOC_GOINGDOWN ioctl
        ext4: add shutdown bit and check for it
        ext4: rename s_resize_flags to s_ext4_flags
        ext4: return EROFS if device is r/o and journal replay is needed
        ext4: preserve the needs_recovery flag when the journal is aborted
        jbd2: don't leak modified metadata buffers on an aborted journal
        ext4: fix inline data error paths
        ext4: move halfmd4 into hash.c directly
        ext4: fix use-after-iput when fscrypt contexts are inconsistent
        jbd2: fix use after free in kjournald2()
        ext4: fix data corruption in data=journal mode
        ext4: trim allocation requests to group size
        ext4: replace BUG_ON with WARN_ON in mb_find_extent()
        ...
      cab7076a
    • Linus Torvalds's avatar
      Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt · 6c24337f
      Linus Torvalds authored
      Pull fscrypt updates from Ted Ts'o:
       "Various cleanups for the file system encryption feature"
      
      * tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt:
        fscrypt: constify struct fscrypt_operations
        fscrypt: properly declare on-stack completion
        fscrypt: split supp and notsupp declarations into their own headers
        fscrypt: remove redundant assignment of res
        fscrypt: make fscrypt_operations.key_prefix a string
        fscrypt: remove unused 'mode' member of fscrypt_ctx
        ext4: don't allow encrypted operations without keys
        fscrypt: make test_dummy_encryption require a keyring key
        fscrypt: factor out bio specific functions
        fscrypt: pass up error codes from ->get_context()
        fscrypt: remove user-triggerable warning messages
        fscrypt: use EEXIST when file already uses different policy
        fscrypt: use ENOTDIR when setting encryption policy on nondirectory
        fscrypt: use ENOKEY when file cannot be created w/o key
      6c24337f
    • Linus Torvalds's avatar
      Merge tag 'device-properties-4.11-rc1' of... · 786856b6
      Linus Torvalds authored
      Merge tag 'device-properties-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
      
      Pull device property updates from Rafael J. Wysocki:
       "Generic device properties framework updates for v4.11-rc1
      
        Allow built-in (static) device properties to be declared as constant,
        make it possible to save memory by discarding alternative (but unused)
        built-in (static) property sets and add support for automatic handling
        of built-in properties to the I2C code"
      
      * tag 'device-properties-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        i2c: allow specify device properties in i2c_board_info
        device property: export code duplicating array of property entries
        device property: constify property arrays values
        device property: allow to constify properties
      786856b6
    • Linus Torvalds's avatar
      Merge tag 'acpi-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 43e31e40
      Linus Torvalds authored
      Pull ACPI updates from Rafael Wysocki:
       "These update the ACPICA code in the kernel to upstream revision
        20170119, which among other things updates copyright notices in all of
        the ACPICA files, fix a couple of issues in the ACPI EC and button
        drivers, fix modalias handling for non-discoverable devices with
        DT-compatible identification strings, add a suspend quirk for one
        platform and fix a message in the APEI code.
      
        Specifics:
      
         - Update of the ACPICA code in the kernel to upstream revision
           20170119 including:
      
            + Fixes related to the handling of the bit width and bit offset
              fields in Generic Address Structure (Lv Zheng)
            + ACPI resources handling fix related to invalid resource
              descriptors (Bob Moore)
            + Fix to enable implicit result conversion for several ASL library
              functions (Bob Moore)
            + Support for method invocations as target operands in AML (Bob
              Moore)
            + Fix to use a correct operand type for DeRefOf() in some
              situations (Bob Moore)
            + Utilities updates (Bob Moore, Lv Zheng)
            + Disassembler/debugger updates (David Box, Lv Zheng)
            + Build fixes (Colin Ian King, Lv Zheng)
            + Update of copyright notices in all files (Bob Moore)
      
         - Fix for modalias handling for SPI and I2C devices with
           DT-compatible identification strings (Dan O'Donovan)
      
         - Fixes for the ACPI EC and button drivers (Lv Zheng)
      
         - ACPI processor handling fix related to CPU hotplug (online/offline)
           on x86 (Vitaly Kuznetsov)
      
         - Suspend quirk to save/restore NVS memory over S3 transitions for
           Lenovo G50-45 (Zhang Rui)
      
         - Message formatting fix for the ACPI APEI code (Colin Ian King)"
      
      * tag 'acpi-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (32 commits)
        ACPICA: Update version to 20170119
        ACPICA: Tools: Update common signon, remove compilation bit width
        ACPICA: Source tree: Update copyright notices to 2017
        ACPICA: Linuxize: Restore and fix Intel compiler build
        x86/ACPI: keep x86_cpu_to_acpiid mapping valid on CPU hotplug
        spi: acpi: Initialize modalias from of_compatible
        i2c: acpi: Initialize info.type from of_compatible
        ACPI / bus: Introduce acpi_of_modalias() equiv of of_modalias_node()
        ACPI: save NVS memory for Lenovo G50-45
        ACPI, APEI, EINJ: fix malformed newline escape
        ACPI / button: Remove lid_init_state=method mode
        ACPI / button: Change default behavior to lid_init_state=open
        ACPI / EC: Use busy polling mode when GPE is not enabled
        ACPI / EC: Remove old CLEAR_ON_RESUME quirk
        ACPICA: Update version to 20161222
        ACPICA: Parser: Update parse info table for some operators
        ACPICA: Fix a problem with recent extra support for control method invocations
        ACPICA: Parser: Allow method invocations as target operands
        ACPICA: Fix for implicit result conversion for the ToXXX functions
        ACPICA: Resources: Not a valid resource if buffer length too long
        ..
      43e31e40
    • Linus Torvalds's avatar
      Merge tag 'pm-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 02c3de11
      Linus Torvalds authored
      Pull power management updates from Rafael Wysocki:
       "The majority of changes go into the Operating Performance Points (OPP)
        framework and cpufreq this time, followed by devfreq and some
        scattered updates all over.
      
        The OPP changes are mostly related to switching over from RCU-based
        synchronization, that turned out to be overly complicated and
        problematic, to reference counting using krefs.
      
        In the cpufreq land there are core cleanups, documentation updates, a
        new driver for Broadcom BMIPS SoCs, a new cpufreq-dt sub-driver for TI
        SoCs that require special handling, ARM64 SoCs support for the qoriq
        driver, intel_pstate updates, powernv driver update and assorted
        fixes.
      
        The devfreq changes are mostly fixes related to the sysfs interface
        and some Exynos drivers updates.
      
        Apart from that, the cpuidle menu governor will support per-CPU PM QoS
        constraints for the wakeup latency now, some bugs in the wakeup IRQs
        framework are fixed, the generic power domains framework should handle
        asynchronous invocations of *noirq suspend/resume callbacks from now
        on, the analyze_suspend.py script is updated and there is a new tool
        for intel_pstate diagnostics.
      
        Specifics:
      
         - Operating Performance Points (OPP) framework fixes, cleanups and
           switch over from RCU-based synchronization to reference counting
           using krefs (Viresh Kumar, Wei Yongjun, Dave Gerlach)
      
         - cpufreq core cleanups and documentation updates (Viresh Kumar,
           Rafael Wysocki)
      
         - New cpufreq driver for Broadcom BMIPS SoCs (Markus Mayer)
      
         - New cpufreq-dt sub-driver for TI SoCs requiring special handling,
           like in the AM335x, AM437x, DRA7x, and AM57x families, along with
           new DT bindings for it (Dave Gerlach, Paul Gortmaker)
      
         - ARM64 SoCs support for the qoriq cpufreq driver (Tang Yuantian)
      
         - intel_pstate driver updates including a new sysfs knob to control
           the driver's operation mode and fixes related to the no_turbo sysfs
           knob and the hardware-managed P-states feature support (Rafael
           Wysocki, Srinivas Pandruvada)
      
         - New interface to export ultra-turbo frequencies for the powernv
           cpufreq driver (Shilpasri Bhat)
      
         - Assorted fixes for cpufreq drivers (Arnd Bergmann, Dan Carpenter,
           Wei Yongjun)
      
         - devfreq core fixes, mostly related to the sysfs interface exported
           by it (Chanwoo Choi, Chris Diamand)
      
         - Updates of the exynos-bus and exynos-ppmu devfreq drivers (Chanwoo
           Choi)
      
         - Device PM QoS extension to support CPUs and support for per-CPU
           wakeup (device resume) latency constraints in the cpuidle menu
           governor (Alex Shi)
      
         - Wakeup IRQs framework fixes (Grygorii Strashko)
      
         - Generic power domains framework update including a fix to make it
           handle asynchronous invocations of *noirq suspend/resume callbacks
           correctly (Ulf Hansson, Geert Uytterhoeven)
      
         - Assorted fixes and cleanups in the core suspend/hibernate code, PM
           QoS framework and x86 ACPI idle support code (Corentin Labbe, Geert
           Uytterhoeven, Geliang Tang, John Keeping, Nick Desaulniers)
      
         - Update of the analyze_suspend.py script is updated to version 4.5
           offering multiple improvements (Todd Brandt)
      
         - New tool for intel_pstate diagnostics using the pstate_sample
           tracepoint (Doug Smythies)"
      
      * tag 'pm-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (85 commits)
        MAINTAINERS: cpufreq: add bmips-cpufreq.c
        PM / QoS: Fix memory leak on resume_latency.notifiers
        PM / Documentation: Spelling s/wrtie/write/
        PM / sleep: Fix test_suspend after sleep state rework
        cpufreq: CPPC: add ACPI_PROCESSOR dependency
        cpufreq: make ti-cpufreq explicitly non-modular
        cpufreq: Do not clear real_cpus mask on policy init
        tools/power/x86: Debug utility for intel_pstate driver
        AnalyzeSuspend: fix drag and zoom bug in javascript
        PM / wakeirq: report a wakeup_event on dedicated wekup irq
        PM / wakeirq: Fix spurious wake-up events for dedicated wakeirqs
        PM / wakeirq: Enable dedicated wakeirq for suspend
        cpufreq: dt: Don't use generic platdev driver for ti-cpufreq platforms
        cpufreq: ti: Add cpufreq driver to determine available OPPs at runtime
        Documentation: dt: add bindings for ti-cpufreq
        PM / OPP: Expose _of_get_opp_desc_node as dev_pm_opp API
        cpufreq: qoriq: Don't look at clock implementation details
        cpufreq: qoriq: add ARM64 SoCs support
        PM / Domains: Provide dummy governors if CONFIG_PM_GENERIC_DOMAINS=n
        cpufreq: brcmstb-avs-cpufreq: remove unnecessary platform_set_drvdata()
        ...
      02c3de11
    • Linus Torvalds's avatar
      Merge tag 'leds_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds · 7aa7d608
      Linus Torvalds authored
      Pull LED updates from Jacek Anaszewski:
       "New features and improvements:
      
         - add new optional brightness_hw_changed attribute for the LEDs that
           may have their brightness level changed autonomously (outside of
           kernel control) by hardware / firmware. The attribute supports
           userspace notifications through POLLPRI events
      
         - add led_brightness_hw_mon tool that demonstrates how to use the
           aforementioned feature
      
         - add LED_ON enum for LEDs that can be only turned on/off, and don't
           allow setting other brightness levels
      
         - allow for adjusting heartbeat trigger blink brightness level
      
        Fixes and cleanups:
      
         - avoid harmless maybe-uninitialized warning in leds-ktd2692.c
      
         - add context to the existing example entries in common LED bindings
           to make the documentation more clear"
      
      * tag 'leds_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds:
        leds: ledtrig-heartbeat: Make top brightness adjustable
        tools/leds: Add led_hw_brightness_mon program
        leds: class: Add new optional brightness_hw_changed attribute
        leds: ktd2692: avoid harmless maybe-uninitialized warning
        leds: add LED_ON brightness as boolean value
        DT: leds: Improve examples by adding some context
      7aa7d608
    • Linus Torvalds's avatar
      Merge tag 'spi-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · 85adbcd5
      Linus Torvalds authored
      Pull spi updates from Mark Brown:
       "This release is mainly a collection of driver specific updates,
        including a few nice cleanups to make drivers use more core features.
      
         - automatically use the parent device to allocate DMA buffers if
           there wasn't an explicitly configured device.
      
         - fixes for leaks on allocation.
      
         - a small piece of the start of SPI slave support, a feature that's
           been on the cards for over a decade!"
      
      * tag 'spi-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (55 commits)
        spi: spi-ti-qspi: Fix error handling
        spi: spi-ti-qspi: Fix error handling
        spi: lantiq-ssc: activate under COMPILE_TEST
        spi: armada-3700: Remove spi_master_put in a3700_spi_remove()
        spi: ti-qspi: revise ti_qspi_probe() failure flow
        spi: spi-ep93xx: simplify GPIO chip selects
        spi: rspi: Replaces "n" by "len" in qspi_transfer_*()
        spi: rspi: Fixes bogus received byte in qspi_transfer_in()
        spi: bcm-qspi: Remove unnecessary platform_set_drvdata()
        spi: bcm-qspi: Fix bcm_qspi_bspi_read() performance
        spi: lantiq-ssc: add support for Lantiq SSC SPI controller
        spi: s3c64xx: fix inconsistency between binding and driver
        spi: armada-3700: Remove .owner field for driver
        spi: bcm-qspi: Added mspi read fallback in bcm_qspi_flash_read()
        spi: fix device-node leaks
        spi: mediatek: Only do dma for 4-byte aligned buffers
        spi: When no dma_chan map buffers with spi_master's parent
        spi: pca2xx-pci: Allow MSI
        spi: pxa2xx: Prepare for edge-triggered interrupts
        spi: pxa2xx: Add support for Intel Gemini Lake
        ...
      85adbcd5
    • Linus Torvalds's avatar
      Merge tag 'regulator-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · f790bd9c
      Linus Torvalds authored
      Pull regulator updates from Mark Brown:
       "Quite a lot of work going on the core this release, mainly around
        system initialization, but a quiet release for drivers:
      
         - fixes for registration of multiple regulators on a PMIC from Javier
           Martinez Canillas and Jon Hunter.
      
         - cleanups to the regulator_get() code from Dmitry Torokhov
      
         - lots of constifcation of structs from Bhumika Goyal
      
         - support for Motorola CPCAP regulators from Tony Lindgren"
      
      * tag 'regulator-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (52 commits)
        regulator: core: Resolve supplies before disabling unused regulators
        regulator: Fix regulator_summary for deviceless consumers
        regulator: tps65086: Fix DT node referencing in of_parse_cb
        regulator: tps65086: Fix expected switch DT node names
        regulator: core: simplify _regulator_get()
        regulator: core: have regulator_dev_lookup() return ERR_PTR-encoded errors
        regulator: gpio: correct default type
        regulator: cpcap: Add basic regulator support
        regulator: core: fix typo in regulator_bulk_disable()
        regulator: core: optimize devm_regulator_bulk_get()
        regulator: core: simplify regulator_bulk_force_disable()
        regulator: core: have _regulator_get() accept get_type argument
        regulator: core: remove dead code in _regulator_get()
        regulator: rn5t618: constify regulator_ops structure
        regulator: rc5t583-regulator: constify regulator_ops structure
        regulator: pv88090-regulator: constify regulator_ops structure
        regulator: pv88080-regulator: constify regulator_ops structure
        regulator: pv88060-regulator: constify regulator_ops structure
        regulator: pfuze100-regulator: constify regulator_ops structure
        regulator: pcf50633-regulator: constify regulator_ops structure
        ...
      f790bd9c
    • Linus Torvalds's avatar
      Merge tag 'regmap-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap · b3de5ad6
      Linus Torvalds authored
      Pull regmap updates from Mark Brown:
       "For v4.11 activity on the regmap API has literally doubled, there are
        two patches this release:
      
         - fixes from Charles Keepax to make the kerneldoc generate correctly
      
         - a cleanup from Geliang Tang using rb_entry() rather than open
           coding it with container_of()"
      
      * tag 'regmap-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
        regmap: Fixup the kernel-doc comments on functions/structures
        regmap: use rb_entry()
      b3de5ad6
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 27a67e0f
      Linus Torvalds authored
      Pull HID updates from Jiri Kosina:
      
       - a lot of Wacom driver updates; most notably second generation Intuos
         Pro is now supported, code from Aaron Armstrong Skomra and Jason
         Gerecke
      
       - Surface 3 and 4 Type Cover Pro support from Daniel Keller, Dennis
         Chen and Yuta Kobayashi
      
       - hid-rmi is now generic transport driver, used by synaptics-rmi4;
         Support the Lenovo Thinkpad X1 Tablet dock follows on top, from
         Andrew Duggan
      
       - a few misc bugfixes and improvements here and there
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (29 commits)
        HID: intel-ish-hid: constify device_type structure
        HID: wacom: Bluetooth IRQ for Intuos Pro should handle prox/range
        HID: intel-ish-hid: ipc: check FW status to distinguish ISH resume paths
        HID: multitouch: fix LG Melfas touchscreen
        HID: wacom: don't apply generic settings to old devices
        HID: wacom: generic: support LEDs
        HID: wacom: generic: support generic touch switch
        HID: wacom: generic: add vendor defined touch
        HID: wacom: generic: add support for touchring
        HID: wacom: generic: remove input_event_flag
        HID: wacom: Support 2nd-gen Intuos Pro's Bluetooth classic interface
        HID: wacom: Move WAC_CMD_* into wacom_wac.h
        HID: wacom: Enable HID_GENERIC codepath for Bluetooth devices
        HID: wacom: do not attempt to switch mode while in probe
        HID: wacom: remove warning while disconnecting devices
        HID: wacom: release the resources before leaving despite devm
        HID: whitespace cleanup
        HID: multitouch: enable Surface 3 Type Cover Pro to report multitouch data
        HID: rmi: Support the Lenovo Thinkpad X1 Tablet dock using hid-rmi
        HID: rmi: Handle all Synaptics touchpads using hid-rmi
        ...
      27a67e0f
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching · 59da2a06
      Linus Torvalds authored
      Pull livepatching updates from Jiri Kosina:
      
       - removal of dead code (Kamalesh Babulal)
      
       - documentation update (Miroslav Benes)
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
        livepatch: doc: remove the limitation for schedule() patching
        powerpc/livepatch: Remove klp_write_module_reloc() stub
      59da2a06
    • Linus Torvalds's avatar
      Merge tag 'iommu-updates-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · ebb4949e
      Linus Torvalds authored
      Pull IOMMU UPDATES from Joerg Roedel:
      
       - KVM PCIe/MSI passthrough support on ARM/ARM64
      
       - introduction of a core representation for individual hardware iommus
      
       - support for IOMMU privileged mappings as supported by some ARM IOMMUS
      
       - 16-bit SID support for ARM-SMMUv2
      
       - stream table optimization for ARM-SMMUv3
      
       - various fixes and other small improvements
      
      * tag 'iommu-updates-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (61 commits)
        vfio/type1: Fix error return code in vfio_iommu_type1_attach_group()
        iommu: Remove iommu_register_instance interface
        iommu/exynos: Make use of iommu_device_register interface
        iommu/mediatek: Make use of iommu_device_register interface
        iommu/msm: Make use of iommu_device_register interface
        iommu/arm-smmu: Make use of the iommu_register interface
        iommu: Add iommu_device_set_fwnode() interface
        iommu: Make iommu_device_link/unlink take a struct iommu_device
        iommu: Add sysfs bindings for struct iommu_device
        iommu: Introduce new 'struct iommu_device'
        iommu: Rename struct iommu_device
        iommu: Rename iommu_get_instance()
        iommu: Fix static checker warning in iommu_insert_device_resv_regions
        iommu: Avoid unnecessary assignment of dev->iommu_fwspec
        iommu/mediatek: Remove bogus 'select' statements
        iommu/dma: Remove bogus dma_supported() implementation
        iommu/ipmmu-vmsa: Restrict IOMMU Domain Geometry to 32-bit address space
        iommu/vt-d: Don't over-free page table directories
        iommu/vt-d: Tylersburg isoch identity map check is done too late.
        iommu/vt-d: Fix some macros that are incorrectly specified in intel-iommu
        ...
      ebb4949e
    • Linus Torvalds's avatar
      Merge tag 'm68k-for-v4.11-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · 937b5b5d
      Linus Torvalds authored
      Pull m68k updates from Geert Uytterhoeven:
      
        - kernel message modernizations and cleanups
      
        - defconfig updates
      
        - cleanups
      
      * tag 'm68k-for-v4.11-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68k/sun3: Remove dead code in paging_init()
        m68k/include: Modernize printing of kernel messages
        m68k/mm: Modernize printing of kernel messages
        m68k/mm: sun3 - Modernize printing of kernel messages
        m68k/kernel: Modernize printing of kernel messages
        m68k/sun3x: Modernize printing of kernel messages
        m68k/sun3: Modernize printing of kernel messages
        m68k/q40: Modernize printing of kernel messages
        m68k/mvme16x: Modernize printing of kernel messages
        m68k/mvme147: Modernize printing of kernel messages
        m68k/bvme6000: Modernize printing of kernel messages
        m68k/68000: Modernize printing of kernel messages
        m68k/atari: Modernize printing of kernel messages
        m68k: Delete an unnecessary variable assignment in sys_cacheflush()
        m68k/mac: Clean up interrupt debug macros and printk statements
        m68k/mac: Remove SHUTUP_SONIC interrupt hack
        m68k/mac: Improve NMI handler
        m68k/defconfig: Update defconfigs for v4.10-rc1
        m68k/mac: Remove unneeded linux/miscdevice.h include
      937b5b5d
    • Linus Torvalds's avatar
      Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · c945d022
      Linus Torvalds authored
      Pull x86 platform updates from Ingo Molnar:
       "Misc platform updates: SGI UV4 support additions, intel-mid Merrifield
        enhancements and purge of old code"
      
      * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (21 commits)
        x86/platform/UV/NMI: Fix uneccessary kABI breakage
        x86/platform/UV: Clean up the NMI code to match current coding style
        x86/platform/UV: Ensure uv_system_init is called when necessary
        x86/platform/UV: Initialize PCH GPP_D_0 NMI Pin to be NMI source
        x86/platform/UV: Verify NMI action is valid, default is standard
        x86/platform/UV: Add basic CPU NMI health check
        x86/platform/UV: Add Support for UV4 Hubless NMIs
        x86/platform/UV: Add Support for UV4 Hubless systems
        x86/platform/UV: Clean up the UV APIC code
        x86/platform/intel-mid: Move watchdog registration to arch_initcall()
        x86/platform/intel-mid: Don't shadow error code of mp_map_gsi_to_irq()
        x86/platform/intel-mid: Allocate RTC interrupt for Merrifield
        x86/ioapic: Return suitable error code in mp_map_gsi_to_irq()
        x86/platform/UV: Fix 2 socket config problem
        x86/platform/UV: Fix panic with missing UVsystab support
        x86/platform/intel-mid: Enable RTC on Intel Merrifield
        x86/platform/intel: Remove PMIC GPIO block support
        x86/platform/intel-mid: Make intel_scu_device_register() static
        x86/platform/intel-mid: Enable GPIO keys on Merrifield
        x86/platform/intel-mid: Get rid of duplication of IPC handler
        ...
      c945d022
  4. 20 Feb, 2017 2 commits
    • Linus Torvalds's avatar
      Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 8b5abde1
      Linus Torvalds authored
      Pull x86 mm updates from Ingo Molnar:
       "A laundry list of changes: KASAN improvements/fixes for ptdump, a
        self-test fix, PAT cleanup and wbinvd() avoidance, removal of stale
        code and documentation updates"
      
      * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/mm/ptdump: Add address marker for KASAN shadow region
        x86/mm/ptdump: Optimize check for W+X mappings for CONFIG_KASAN=y
        x86/mm/pat: Use rb_entry()
        x86/mpx: Re-add MPX to selftests Makefile
        x86/mm: Remove CONFIG_DEBUG_NX_TEST
        x86/mm/cpa: Avoid wbinvd() for PREEMPT
        x86/mm: Improve documentation for low-level device I/O functions
      8b5abde1
    • Linus Torvalds's avatar
      Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · a25a1d6c
      Linus Torvalds authored
      Pull x86 microcode updates from Ingo Molnar:
       "The main changes are further simplification and unification of the
        code between the AMD and Intel microcode loaders, plus other
        simplifications - by Borislav Petkov"
      
      * 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/microcode/AMD: Remove struct cont_desc.eq_id
        x86/microcode/AMD: Remove AP scanning optimization
        x86/microcode/AMD: Simplify saving from initrd
        x86/microcode/AMD: Unify load_ucode_amd_ap()
        x86/microcode/AMD: Check patch level only on the BSP
        x86/microcode: Remove local vendor variable
        x86/microcode/AMD: Use find_microcode_in_initrd()
        x86/microcode/AMD: Get rid of global this_equiv_id
        x86/microcode: Decrease CPUID use
        x86/microcode/AMD: Rework container parsing
        x86/microcode/AMD: Extend the container struct
        x86/microcode/AMD: Shorten function parameter's name
        x86/microcode/AMD: Clean up find_equiv_id()
        x86/microcode: Convert to bare minimum MSR accessors
        x86/MSR: Carve out bare minimum accessors
      a25a1d6c