1. 17 Mar, 2016 24 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · d66435cc
      Linus Torvalds authored
      Pull HID updates from Jiri Kosina:
       - functionally equivalent cleanups for wacom driver, making the code
         more readable, from Benjamin Tissoires
       - a bunch of improvements and fixes for thingm driver from Heiner
       - bugfixes to out-of-bound access for generic parsing functions (which
         have been there since ever) extract() and implement(), from Dmitry
       - a lot of added / improved device support in sony, wacom, microsoft,
         multitouch and logitech driver, from various people
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (44 commits)
        HID: microsoft: Add ID for MS Wireless Comfort Keyboard
        hid: thingm: reorder calls in thingm_probe
        HID: i2c-hid: fix OOB write in i2c_hid_set_or_send_report()
        HID: multitouch: Release all touch slots on reset_resume
        HID: usbhid: enable NO_INIT_REPORTS quirk for Semico USB Keykoard2
        HID: penmount: report only one button for PenMount 6000 USB touchscreen controller
        HID: i2c-hid: Fix suspend/resume when already runtime suspended
        HID: i2c-hid: Add hid-over-i2c name to i2c id table
        HID: multitouch: force retrieving of Win8 signature blob
        HID: Support for CMedia CM6533 HID audio jack controls
        HID: thingm: improve locking
        HID: thingm: switch to managed version of led_classdev_register
        HID: thingm: remove workqueue
        HID: corsair: fix mapping of non-keyboard usages
        HID: wacom: close the wireless receiver on remove()
        HID: wacom: cleanup input devices
        HID: wacom: reuse wacom_parse_and_register() in wireless_work
        HID: wacom: move down wireless_work()
        HID: wacom: break out parsing of device and registering of input
        HID: wacom: break out wacom_intuos_get_tool_type
    • Linus Torvalds's avatar
      Merge tag 'gpio-v4.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · 1a46712a
      Linus Torvalds authored
      Pull GPIO updates from Linus Walleij:
       "This is the bulk of GPIO changes for kernel v4.6.  There is quite a
        lot of interesting stuff going on.
        The patches to other subsystems and arch-wide are ACKed as far as
        possible, though I consider things like per-arch <asm/gpio.h> as
        essentially a part of the GPIO subsystem so it should not be needed.
        Core changes:
         - The gpio_chip is now a *real device*.  Until now the gpio chips
           were just piggybacking the parent device or (gasp) floating in
           space outside of the device model.
           We now finally make GPIO chips devices.  The gpio_chip will create
           a gpio_device which contains a struct device, and this gpio_device
           struct is kept private.  Anything that needs to be kept private
           from the rest of the kernel will gradually be moved over to the
         - As a result of making the gpio_device a real device, we have added
           resource management, so devm_gpiochip_add_data() will cut down on
           overhead and reduce code lines.  A huge slew of patches convert
           almost all drivers in the subsystem to use this.
         - Building on making the GPIO a real device, we add the first step of
           a new userspace ABI: the GPIO character device.  We take small
           steps here, so we first add a pure *information* ABI and the tool
           "lsgpio" that will list all GPIO devices on the system and all
           lines on these devices.
           We can now discover GPIOs properly from userspace.  We still have
           not come up with a way to actually *use* GPIOs from userspace.
         - To encourage people to use the character device for the future, we
           have it always-enabled when using GPIO.  The old sysfs ABI is still
           opt-in (and can be used in parallel), but is marked as deprecated.
           We will keep it around for the foreseeable future, but it will not
           be extended to cover ever more use cases.
         - Bjorn Helgaas removed a whole slew of per-architecture <asm/gpio.h>
           This dates back to when GPIO was an opt-in feature and no shared
           library even existed: just a header file with proper prototypes was
           provided and all semantics were up to the arch to implement.  These
           patches make the GPIO chip even more a proper device and cleans out
           leftovers of the old in-kernel API here and there.
           Still some cruft is left but it's very little now.
         - There is still some clamping of return values for .get() going on,
           but we now return sane values in the vast majority of drivers and
           the errorpath is sanitized.  Some patches for powerpc, blackfin and
           unicore still drop in.
         - We continue to switch the ARM, MIPS, blackfin, m68k local GPIO
           implementations to use gpiochip_add_data() and cut down on code
         - MPC8xxx is converted to use the generic GPIO helpers.
         - ATH79 is converted to use the generic GPIO helpers.
        New drivers:
         - WinSystems WS16C48
         - Acces 104-DIO-48E
         - F81866 (a F7188x variant)
         - Qoric (a MPC8xxx variant)
         - TS-4800
         - SPI serializers (pisosr): simple 74xx shift registers connected to
           SPI to obtain a dirt-cheap output-only GPIO expander.
         - Texas Instruments TPIC2810
         - Texas Instruments TPS65218
         - Texas Instruments TPS65912
         - X-Gene (ARM64) standby GPIO controller"
      * tag 'gpio-v4.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (194 commits)
        Revert "Share upstreaming patches"
        gpio: mcp23s08: Fix clearing of interrupt.
        gpiolib: Fix comment referring to gpio_*() in gpiod_*()
        gpio: pca953x: Fix pca953x_gpio_set_multiple() on 64-bit
        gpio: xgene: Fix kconfig for standby GIPO contoller
        gpio: Add generic serializer DT binding
        gpio: uapi: use 0xB4 as ioctl() major
        gpio: tps65912: fix bad merge
        Revert "gpio: lp3943: Drop pin_used and lp3943_gpio_request/lp3943_gpio_free"
        gpio: omap: drop dev field from gpio_bank structure
        gpio: mpc8xxx: Slightly update the code for better readability
        gpio: mpc8xxx: Remove *read_reg and *write_reg from struct mpc8xxx_gpio_chip
        gpio: mpc8xxx: Fixup setting gpio direction output
        gpio: mcp23s08: Add support for mcp23s18
        dt-bindings: gpio: altera: Fix altr,interrupt-type property
        gpio: add driver for MEN 16Z127 GPIO controller
        gpio: lp3943: Drop pin_used and lp3943_gpio_request/lp3943_gpio_free
        gpio: timberdale: Switch to devm_ioremap_resource()
        gpio: ts4800: Add IMX51 dependency
        gpiolib: rewrite gpiodev_add_to_list
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · 82b666ee
      Linus Torvalds authored
      Pull m68knommu updates from Greg Ungerer:
       "The main change is the removal of the bit-rotten 68360 support.  Also
        a fix to always make the ethernet FEC platform info available"
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
        m68knommu: remove obsolete 68360 support
        m68knommu: fix FEC platform device registration when driver is modular
    • Linus Torvalds's avatar
      Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 588ab3f9
      Linus Torvalds authored
      Pull arm64 updates from Catalin Marinas:
       "Here are the main arm64 updates for 4.6.  There are some relatively
        intrusive changes to support KASLR, the reworking of the kernel
        virtual memory layout and initial page table creation.
         - Initial page table creation reworked to avoid breaking large block
           mappings (huge pages) into smaller ones.  The ARM architecture
           requires break-before-make in such cases to avoid TLB conflicts but
           that's not always possible on live page tables
         - Kernel virtual memory layout: the kernel image is no longer linked
           to the bottom of the linear mapping (PAGE_OFFSET) but at the bottom
           of the vmalloc space, allowing the kernel to be loaded (nearly)
           anywhere in physical RAM
         - Kernel ASLR: position independent kernel Image and modules being
           randomly mapped in the vmalloc space with the randomness is
           provided by UEFI (efi_get_random_bytes() patches merged via the
           arm64 tree, acked by Matt Fleming)
         - Implement relative exception tables for arm64, required by KASLR
           (initial code for ARCH_HAS_RELATIVE_EXTABLE added to lib/extable.c
           but actual x86 conversion to deferred to 4.7 because of the merge
         - Support for the User Access Override feature of ARMv8.2: this
           allows uaccess functions (get_user etc.) to be implemented using
           LDTR/STTR instructions.  Such instructions, when run by the kernel,
           perform unprivileged accesses adding an extra level of protection.
           The set_fs() macro is used to "upgrade" such instruction to
           privileged accesses via the UAO bit
         - Half-precision floating point support (part of ARMv8.2)
         - Optimisations for CPUs with or without a hardware prefetcher (using
           run-time code patching)
         - copy_page performance improvement to deal with 128 bytes at a time
         - Sanity checks on the CPU capabilities (via CPUID) to prevent
           incompatible secondary CPUs from being brought up (e.g.  weird
           big.LITTLE configurations)
         - valid_user_regs() reworked for better sanity check of the
           sigcontext information (restored pstate information)
         - ACPI parking protocol implementation
         - CONFIG_DEBUG_RODATA enabled by default
         - VDSO code marked as read-only
         - DEBUG_PAGEALLOC support
         - ARCH_HAS_UBSAN_SANITIZE_ALL enabled
         - Erratum workaround Cavium ThunderX SoC
         - set_pte_at() fix for PROT_NONE mappings
         - Code clean-ups"
      * tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (99 commits)
        arm64: kasan: Fix zero shadow mapping overriding kernel image shadow
        arm64: kasan: Use actual memory node when populating the kernel image shadow
        arm64: Update PTE_RDONLY in set_pte_at() for PROT_NONE permission
        arm64: Fix misspellings in comments.
        arm64: efi: add missing frame pointer assignment
        arm64: make mrs_s prefixing implicit in read_cpuid
        arm64: enable CONFIG_DEBUG_RODATA by default
        arm64: Rework valid_user_regs
        arm64: mm: check at build time that PAGE_OFFSET divides the VA space evenly
        arm64: KVM: Move kvm_call_hyp back to its original localtion
        arm64: mm: treat memstart_addr as a signed quantity
        arm64: mm: list kernel sections in order
        arm64: lse: deal with clobbered IP registers after branch via PLT
        arm64: mm: dump: Use VA_START directly instead of private LOWEST_ADDR
        arm64: kconfig: add submenu for 8.2 architectural features
        arm64: kernel: acpi: fix ioremap in ACPI parking protocol cpu_postboot
        arm64: Add support for Half precision floating point
        arm64: Remove fixmap include fragility
        arm64: Add workaround for Cavium erratum 27456
        arm64: mm: Mark .rodata as RO
    • Linus Torvalds's avatar
      Merge tag 'linux-kselftest-4.6-rc1' of... · 3d15cfdb
      Linus Torvalds authored
      Merge tag 'linux-kselftest-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
      Pull Kselftest updates from Shuah Khan:
       "This update for Kselftest adds:
         - A new feature to create test-specific kconfig fragments.  This
           feature helps configure Kselftests to test specific Kernel
           Configuration options as opposed to defconfig.
         - A new test for Media Controller API
         - A few fixes"
      * tag 'linux-kselftest-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
        selftests: media_dcevice_test fix usage information
        selftests: media_dcevice_test fix to handle ioctl failure case
        selftests: add missing .gitignore file or entry
        Makefile: add kselftest-merge
        selftests: create test-specific kconfig fragments
        selftests: breakpoint: add step_after_suspend_test
        selftests: add a new test for Media Controller API
    • Linus Torvalds's avatar
      Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · 5cd0911a
      Linus Torvalds authored
      Pull pstore update from Tony Luck:
       "Allow ram backend to be configured with addresses above 4GB"
      * tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        pstore: Add support for 64 Bit address space
    • Linus Torvalds's avatar
      Merge tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 · 1ca80a0a
      Linus Torvalds authored
      Pull GFS2 updates from Bob Peterson:
       "We only have six patches ready for this merge window:
         - Arnd Bergmann contributed a patch that fixes an uninitialized
           variable warning.
         - The second patch avoids a kernel panic due to referencing an iopen
           glock that may not be held, in an error path.
         - The third patch fixes a rounding error that caused xfs_tests direct
           IO write "fsx" tests to fail on GFS2.
         - The fourth patch tidies up the code path when glocks are being
           reused to recreate a dinode that was recently deleted.
         - The fifth reverts an ages-old patch that should no longer be
           needed, and which interfered with the transition of dinodes from
           unlinked to free.
         - And lastly, a patch to eliminate a function parameter that's not
      * tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
        GFS2: Eliminate parameter non_block on gfs2_inode_lookup
        GFS2: Don't filter out I_FREEING inodes anymore
        GFS2: Prevent delete work from occurring on glocks used for create
        GFS2: Fix direct IO write rounding error
        gfs2: avoid uninitialized variable warning
        GFS2: Check if iopen is held when deleting inode
    • Linus Torvalds's avatar
      Merge tag 'dlm-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm · d77bed0d
      Linus Torvalds authored
      Pull dlm updates from David Teigland:
       "Previous changes introduced the use of socket error reporting for dlm
        sockets.  This set includes two fixes in how the socket error
        callbacks are used"
      * tag 'dlm-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
        DLM: Save and restore socket callbacks properly
        DLM: Replace nodeid_to_addr with kernel_getpeername
    • Linus Torvalds's avatar
      Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · faeb20ec
      Linus Torvalds authored
      Pull ext4 updates from Ted Ts'o:
       "Performance improvements in SEEK_DATA and xattr scalability
        improvements, plus a lot of clean ups and bug fixes"
      * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (38 commits)
        ext4: clean up error handling in the MMP support
        jbd2: do not fail journal because of frozen_buffer allocation failure
        ext4: use __GFP_NOFAIL in ext4_free_blocks()
        ext4: fix compile error while opening the macro DOUBLE_CHECK
        ext4: print ext4 mount option data_err=abort correctly
        ext4: fix NULL pointer dereference in ext4_mark_inode_dirty()
        ext4: drop unneeded BUFFER_TRACE in ext4_delete_inline_entry()
        ext4: fix misspellings in comments.
        jbd2: fix FS corruption possibility in jbd2_journal_destroy() on umount path
        ext4: more efficient SEEK_DATA implementation
        ext4: cleanup handling of bh->b_state in DAX mmap
        ext4: return hole from ext4_map_blocks()
        ext4: factor out determining of hole size
        ext4: fix setting of referenced bit in ext4_es_lookup_extent()
        ext4: remove i_ioend_count
        ext4: simplify io_end handling for AIO DIO
        ext4: move trans handling and completion deferal out of _ext4_get_block
        ext4: rename and split get blocks functions
        ext4: use i_mutex to serialize unaligned AIO DIO
        ext4: pack ioend structure better
    • Linus Torvalds's avatar
      Merge tag 'configfs-for-linus' of git://git.infradead.org/users/hch/configfs · 364e8dd9
      Linus Torvalds authored
      Pull configfs updates from Christoph Hellwig:
       - A large patch from me to simplify setting up the list of default
         groups by actually implementing it as a list instead of an array.
       - a small Y2083 prep patch from Deepa Dinamani.  Probably doesn't
         matter on it's own, but it seems like he is trying to get rid of all
         CURRENT_TIME uses in file systems, which is a worthwhile goal.
      * tag 'configfs-for-linus' of git://git.infradead.org/users/hch/configfs:
        configfs: switch ->default groups to a linked list
        configfs: Replace CURRENT_TIME by current_fs_time()
    • Linus Torvalds's avatar
      Merge tag 'usb-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 48d10bda
      Linus Torvalds authored
      Pull USB updates from Greg KH:
       "Here is the big USB patchset for 4.6-rc1.
        The normal mess is here, gadget and xhci fixes and updates, and lots
        of other driver updates and cleanups as well.  Full details are in the
        All have been in linux-next for a while with no reported issues"
      * tag 'usb-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (266 commits)
        USB: core: let USB device know device node
        usb: devio: Add ioctl to disallow detaching kernel USB drivers.
        usb: gadget: f_acm: Fix configfs attr name
        usb: udc: lpc32xx: remove USB PLL and USB OTG clock management
        usb: udc: lpc32xx: remove direct access to clock controller registers
        usb: udc: lpc32xx: switch to clock prepare/unprepare model
        usb: renesas_usbhs: gadget: fix giveback status code in usbhsg_pipe_disable()
        usb: gadget: renesas_usb3: Use ARCH_RENESAS
        usb: dwc2: Fix issues in dwc2_complete_non_isoc_xfer_ddma()
        usb: dwc2: Add support for Lantiq ARX and XRX SoCs
        usb: phy: generic: Handle late registration of gadget
        usb: gadget: bdc_udc: fix race condition in bdc_udc_exit()
        usb: musb: core: added missing const qualifier to musb_hdrc_platform_data::config
        usb: dwc2: Move host-specific core functions into hcd.c
        usb: dwc2: Move register save and restore functions
        usb: dwc2: Use kmem_cache_free()
        usb: dwc2: host: If using uframe scheduler, end splits better
        usb: dwc2: host: Totally redo the microframe scheduler
        usb: dwc2: host: Properly set even/odd frame
        usb: dwc2: host: Add dwc2_hcd_get_future_frame_number() call
    • Linus Torvalds's avatar
      Merge tag 'tty-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 96b9b1c9
      Linus Torvalds authored
      Pull tty/serial updates from Greg KH:
       "Here's the big tty/serial driver pull request for 4.6-rc1.
        Lots of changes in here, Peter has been on a tear again, with lots of
        refactoring and bugs fixes, many thanks to the great work he has been
        doing.  Lots of driver updates and fixes as well, full details in the
        All have been in linux-next for a while with no reported issues"
      * tag 'tty-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (220 commits)
        serial: 8250: describe CONFIG_SERIAL_8250_RSA
        serial: samsung: optimize UART rx fifo access routine
        serial: pl011: add mark/space parity support
        serial: sa1100: make sa1100_register_uart_fns a function
        tty: serial: 8250: add MOXA Smartio MUE boards support
        serial: 8250: convert drivers to use up_to_u8250p()
        serial: 8250/mediatek: fix building with SERIAL_8250=m
        serial: 8250/ingenic: fix building with SERIAL_8250=m
        serial: 8250/uniphier: fix modular build
        Revert "drivers/tty/serial: make 8250/8250_ingenic.c explicitly non-modular"
        Revert "drivers/tty/serial: make 8250/8250_mtk.c explicitly non-modular"
        serial: mvebu-uart: initial support for Armada-3700 serial port
        serial: mctrl_gpio: Add missing module license
        serial: ifx6x60: avoid uninitialized variable use
        tty/serial: at91: fix bad offset for UART timeout register
        tty/serial: at91: restore dynamic driver binding
        serial: 8250: Add hardware dependency to RT288X option
        TTY, devpts: document pty count limiting
        tty: goldfish: support platform_device with id -1
        drivers: tty: goldfish: Add device tree bindings
    • Linus Torvalds's avatar
      Merge tag 'char-misc-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · 8eee93e2
      Linus Torvalds authored
      Pull char/misc updates from Greg KH:
       "Here is the big char/misc driver update for 4.6-rc1.
        The majority of the patches here is hwtracing and some new mic
        drivers, but there's a lot of other driver updates as well.  Full
        details in the shortlog.
        All have been in linux-next for a while with no reported issues"
      * tag 'char-misc-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (238 commits)
        goldfish: Fix build error of missing ioremap on UM
        nvmem: mediatek: Fix later provider initialization
        nvmem: imx-ocotp: Fix return value of imx_ocotp_read
        nvmem: Fix dependencies for !HAS_IOMEM archs
        char: genrtc: replace blacklist with whitelist
        drivers/hwtracing: make coresight-etm-perf.c explicitly non-modular
        drivers: char: mem: fix IS_ERROR_VALUE usage
        char: xillybus: Fix internal data structure initialization
        pch_phub: return -ENODATA if ROM can't be mapped
        Drivers: hv: vmbus: Support kexec on ws2012 r2 and above
        Drivers: hv: vmbus: Support handling messages on multiple CPUs
        Drivers: hv: utils: Remove util transport handler from list if registration fails
        Drivers: hv: util: Pass the channel information during the init call
        Drivers: hv: vmbus: avoid unneeded compiler optimizations in vmbus_wait_for_unload()
        Drivers: hv: vmbus: remove code duplication in message handling
        Drivers: hv: vmbus: avoid wait_for_completion() on crash
        Drivers: hv: vmbus: don't loose HVMSG_TIMER_EXPIRED messages
        misc: at24: replace memory_accessor with nvmem_device_read
        eeprom: 93xx46: extend driver to plug into the NVMEM framework
        eeprom: at25: extend driver to plug into the NVMEM framework
    • Linus Torvalds's avatar
      Merge tag 'driver-core-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · 1a4ab084
      Linus Torvalds authored
      Pull driver core updates from Greg KH:
       "Just a few patches this time around for the 4.6-rc1 merge window.
        Largest is a new firmware driver, but there are some other updates to
        the driver core in here as well, the shortlog has the details.
        All have been in linux-next for a while with no reported issues"
      * tag 'driver-core-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        Revert "driver-core: platform: probe of-devices only using list of compatibles"
        firmware: qemu config needs I/O ports
        firmware: qemu_fw_cfg.c: fix typo FW_CFG_DATA_OFF
        driver-core: platform: probe of-devices only using list of compatibles
        driver-core: platform: fix typo in documentation for multi-driver helper
        component: remove impossible condition
        drivers: dma-coherent: simplify dma_init_coherent_memory return value
        devicetree: update documentation for fw_cfg ARM bindings
        firmware: create directory hierarchy for sysfs fw_cfg entries
        firmware: introduce sysfs driver for QEMU's fw_cfg device
        kobject: export kset_find_obj() for module use
        driver core: bus: use to_subsys_private and to_device_private_bus
        driver core: bus: use list_for_each_entry*
        debugfs: Add stub function for debugfs_create_automount().
        kernfs: make kernfs_walk_ns() use kernfs_pr_cont_buf[]
    • Linus Torvalds's avatar
      Merge tag 'vfio-v4.6-rc1' of git://github.com/awilliam/linux-vfio · 45cb5230
      Linus Torvalds authored
      Pull VFIO updates from Alex Williamson:
       "Various enablers for assignment of Intel graphics devices and future
        support of vGPU devices (Alex Williamson).  This includes
         - Handling the vfio type1 interface as an API rather than a specific
           implementation, allowing multiple type1 providers.
         - Capability chains, similar to PCI device capabilities, that allow
           extending ioctls.  Extensions here include device specific regions
           and sparse mmap descriptions.  The former is used to expose non-PCI
           regions for IGD, including the OpRegion (particularly the Video
           BIOS Table), and read only PCI config access to the host and LPC
           bridge as drivers often depend on identifying those devices.
           Sparse mmaps here are used to describe the MSIx vector table, which
           vfio has always protected from mmap, but never had an API to
           explicitly define that protection.  In future vGPU support this is
           expected to allow the description of PCI BARs that may mix direct
           access and emulated access within a single region.
         - The ability to expose the shadow ROM as an option ROM as IGD use
           cases may rely on the ROM even though the physical device does not
           make use of a PCI option ROM BAR"
      * tag 'vfio-v4.6-rc1' of git://github.com/awilliam/linux-vfio:
        vfio/pci: return -EFAULT if copy_to_user fails
        vfio/pci: Expose shadow ROM as PCI option ROM
        vfio/pci: Intel IGD host and LCP bridge config space access
        vfio/pci: Intel IGD OpRegion support
        vfio/pci: Enable virtual register in PCI config space
        vfio/pci: Add infrastructure for additional device specific regions
        vfio: Define device specific region type capability
        vfio/pci: Include sparse mmap capability for MSI-X table regions
        vfio: Define sparse mmap capability for regions
        vfio: Add capability chain helpers
        vfio: Define capability chains
        vfio: If an IOMMU backend fails, keep looking
        vfio/pci: Fix unsigned comparison overflow
    • Linus Torvalds's avatar
      Merge tag 'hsi-for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi · 3c0b8d1c
      Linus Torvalds authored
      Pull HSI updates from Sebastian Reichel:
       "nokia-modem: add N950 and N9 support"
      * tag 'hsi-for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
        HSI: ssi-protocol: Use handshake logic from n950
        HSI: nokia-modem: add n950 and n9 support
    • Linus Torvalds's avatar
      Merge tag 'for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply · 9cc984e4
      Linus Torvalds authored
      Pull power supply and reset changes from Sebastian Reichel:
       - add types for USB Type C and PD chargers
       - add act8945a charger driver
       - add ACPI/DT bindings for goldfish-battery
       - add support for versatile reset controller
       - misc fixes
      * tag 'for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (24 commits)
        power: pm2301-charger: use __maybe_unused to hide pm functions
        power: ipaq-micro-battery: use __maybe_unused to hide pm functions
        power_supply: 88pm860x_charger: do not pass NULL to power_supply_put
        jz4740-battery: Correct voltage change check
        power_supply: lp8788-charger: initialize boolean 'found'
        goldfish: Enable ACPI-based enumeration for goldfish battery
        power: goldfish_battery: add devicetree bindings
        power: act8945a: add charger driver for ACT8945A
        power: add documentation for ACT8945A's charger DT bindings
        ARM: dts: n900: Rename isp1704 to isp1707 to match correct name
        power_supply: bq27xxx_battery: Add of modalias and match table when CONFIG_OF is enabled
        power_supply: bq2415x_charger: Add of modalias and match table when CONFIG_OF is enabled
        power_supply: bq2415x_charger: Do not add acpi modalias when CONFIG_ACPI is not enabled
        power_supply: isp1704_charger: Add compatible of match for nxp,isp1707
        power_supply: isp1704_charger: Error messages when probe fail
        power_supply: Add types for USB Type C and PD chargers
        power: bq24735-charger: add 'ti,external-control' option
        power: bq24735-charger: document 'ti,external-control' option
        power: bq24735-charger: fix failed i2c with ac-detect
        power: reset: Fix dependencies for !HAS_IOMEM archs
    • Linus Torvalds's avatar
      Merge tag 'dmaengine-4.6-rc1' of git://git.infradead.org/users/vkoul/slave-dma · b5b131c7
      Linus Torvalds authored
      Pull dmaengine updates from Vinod Koul:
       "This is smallish update with minor changes to core and new driver and
        usual updates.  Nothing super exciting here..
         - We have made slave address as physical to enable driver to do the
         - We now expose the maxburst for slave dma as new capability so
           clients can know this and program accordingly
         - addition of device synchronize callbacks on omap and edma.
         - pl330 updates to support DMAFLUSHP for Rockchip platforms.
         - Updates and improved sg handling in Xilinx VDMA driver.
         - New hidma qualcomm dma driver, though some bits are still in
      * tag 'dmaengine-4.6-rc1' of git://git.infradead.org/users/vkoul/slave-dma: (40 commits)
        dmaengine: IOATDMA: revise channel reset workaround on CB3.3 platforms
        dmaengine: add Qualcomm Technologies HIDMA channel driver
        dmaengine: add Qualcomm Technologies HIDMA management driver
        dmaengine: hidma: Add Device Tree binding
        dmaengine: qcom_bam_dma: move to qcom directory
        dmaengine: tegra: Move of_device_id table near to its user
        dmaengine: xilinx_vdma: Remove unnecessary variable initializations
        dmaengine: sirf: use __maybe_unused to hide pm functions
        dmaengine: rcar-dmac: clear pertinence number of channels
        dmaengine: sh: shdmac: don't open code of_device_get_match_data()
        dmaengine: tegra: don't open code of_device_get_match_data()
        dmaengine: qcom_bam_dma: Make driver work for BE
        dmaengine: sun4i: support module autoloading
        dma/mic_x100_dma: IS_ERR() vs PTR_ERR() typo
        dmaengine: xilinx_vdma: Use readl_poll_timeout instead of do while loop's
        dmaengine: xilinx_vdma: Simplify spin lock handling
        dmaengine: xilinx_vdma: Fix issues with non-parking mode
        dmaengine: xilinx_vdma: Improve SG engine handling
        dmaengine: pl330: fix to support the burst mode
        dmaengine: make slave address physical
    • Linus Torvalds's avatar
      Merge tag 'rproc-v4.6' of git://github.com/andersson/remoteproc · c7eec380
      Linus Torvalds authored
      Pull remoteproc updates from Bjorn Andersson:
       "New driver for controlling ST's remote processors and a couple of
        minor fixes.  Also includes the addition of myself as co-maintainer"
      Acked-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
      * tag 'rproc-v4.6' of git://github.com/andersson/remoteproc:
        MAINTAINERS: Add co-maintainer for remoteproc subsystems
        remoteproc: Supply controller driver for ST's Remote Processors
        remoteproc: debugfs: Add ability to boot remote processor using debugfs
        remoteproc: dt: Provide bindings for ST's Remote Processor Controller driver
        remoteproc: debugfs: Return error on invalid 'count' value
        remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias
        remoteproc: report error if resource table doesn't exist
    • Linus Torvalds's avatar
      Merge tag 'docs-for-linus' of git://git.lwn.net/linux · 37aa7319
      Linus Torvalds authored
      Pul documentation update from Jon Corbet:
       "Another relatively boring cycle for the docs tree: typo fixes,
        translation updates, etc"
      * tag 'docs-for-linus' of git://git.lwn.net/linux:
        modsign: Fix documentation on module signing enforcement parameter.
        Doc: nfs: Fix typos in Documentation/filesystems/nfs
        Documentation: kselftest: Remove duplicate word
        doc: fix grammar
        Documentation: Howto: Fixed subtitles style
        Doc: ARM: Fix a typo in clksrc-change-registers.awk
        Documentation/ko_KR: update maintainer information
        Documentation: Fix int/unsigned int comparison
        Documentation: Chinese translation of arm64/silicon-errata.txt
        Documentation:Update Documentation/zh_CN/arm64/booting.txt
        Documentation: HOWTO: remove obsolete info about regression postings
        Doc: ja_JP: Fix a typo in HOWTO
        Doc: i2c: Fix typo in Documentation/i2c
        Doc: DocBook: Fix a typo in device-drivers.tmpl
        Remove "arch" usage in Documentation/features/list-arch.sh
        README: cosmetic fixes
        Documentation/CodingStyle: add space before parenthesis in example macro
        SubmittingPatches: fix spelling of "git send-email"
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · bb7aeae3
      Linus Torvalds authored
      Pull security layer updates from James Morris:
       "There are a bunch of fixes to the TPM, IMA, and Keys code, with minor
        fixes scattered across the subsystem.
        IMA now requires signed policy, and that policy is also now measured
        and appraised"
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (67 commits)
        X.509: Make algo identifiers text instead of enum
        akcipher: Move the RSA DER encoding check to the crypto layer
        crypto: Add hash param to pkcs1pad
        sign-file: fix build with CMS support disabled
        MAINTAINERS: update tpmdd urls
        MODSIGN: linux/string.h should be #included to get memcpy()
        certs: Fix misaligned data in extra certificate list
        X.509: Handle midnight alternative notation in GeneralizedTime
        X.509: Support leap seconds
        Handle ISO 8601 leap seconds and encodings of midnight in mktime64()
        X.509: Fix leap year handling again
        PKCS#7: fix unitialized boolean 'want'
        firmware: change kernel read fail to dev_dbg()
        KEYS: Use the symbol value for list size, updated by scripts/insert-sys-cert
        KEYS: Reserve an extra certificate symbol for inserting without recompiling
        modsign: hide openssl output in silent builds
        tpm_tis: fix build warning with tpm_tis_resume
        ima: require signed IMA policy
        ima: measure and appraise the IMA policy itself
        ima: load policy using path
    • Linus Torvalds's avatar
      Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 70477371
      Linus Torvalds authored
      Pull crypto update from Herbert Xu:
       "Here is the crypto update for 4.6:
         - Convert remaining crypto_hash users to shash or ahash, also convert
           blkcipher/ablkcipher users to skcipher.
         - Remove crypto_hash interface.
         - Remove crypto_pcomp interface.
         - Add crypto engine for async cipher drivers.
         - Add akcipher documentation.
         - Add skcipher documentation.
         - Rename crypto/crc32 to avoid name clash with lib/crc32.
         - Fix bug in keywrap where we zero the wrong pointer.
         - Support T5/M5, T7/M7 SPARC CPUs in n2 hwrng driver.
         - Add PIC32 hwrng driver.
         - Support BCM6368 in bcm63xx hwrng driver.
         - Pack structs for 32-bit compat users in qat.
         - Use crypto engine in omap-aes.
         - Add support for sama5d2x SoCs in atmel-sha.
         - Make atmel-sha available again.
         - Make sahara hashing available again.
         - Make ccp hashing available again.
         - Make sha1-mb available again.
         - Add support for multiple devices in ccp.
         - Improve DMA performance in caam.
         - Add hashing support to rockchip"
      * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (116 commits)
        crypto: qat - remove redundant arbiter configuration
        crypto: ux500 - fix checks of error code returned by devm_ioremap_resource()
        crypto: atmel - fix checks of error code returned by devm_ioremap_resource()
        crypto: qat - Change the definition of icp_qat_uof_regtype
        hwrng: exynos - use __maybe_unused to hide pm functions
        crypto: ccp - Add abstraction for device-specific calls
        crypto: ccp - CCP versioning support
        crypto: ccp - Support for multiple CCPs
        crypto: ccp - Remove check for x86 family and model
        crypto: ccp - memset request context to zero during import
        lib/mpi: use "static inline" instead of "extern inline"
        lib/mpi: avoid assembler warning
        hwrng: bcm63xx - fix non device tree compatibility
        crypto: testmgr - allow rfc3686 aes-ctr variants in fips mode.
        crypto: qat - The AE id should be less than the maximal AE number
        lib/mpi: Endianness fix
        crypto: rockchip - add hash support for crypto engine in rk3288
        crypto: xts - fix compile errors
        crypto: doc - add skcipher API documentation
        crypto: doc - update AEAD AD handling
    • Jiri Kosina's avatar
      Merge branches 'for-4.5/upstream-fixes', 'for-4.6/cmedia', 'for-4.6/i2c-hid',... · e1c9b9ff
      Jiri Kosina authored
      Merge branches 'for-4.5/upstream-fixes', 'for-4.6/cmedia', 'for-4.6/i2c-hid', 'for-4.6/logitech', 'for-4.6/multitouch', 'for-4.6/penmount', 'for-4.6/sony', 'for-4.6/thingm', 'for-4.6/upstream' and 'for-4.6/wacom' into for-linus
    • Linus Walleij's avatar
      Revert "Share upstreaming patches" · ccbd805a
      Linus Walleij authored
      This reverts commit a101ad94.
  2. 16 Mar, 2016 16 commits
    • Linus Torvalds's avatar
      Merge tag 'fbdev-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux · 09fd671c
      Linus Torvalds authored
      Pull fbdev updates from Tomi Valkeinen:
       - Miscallaneous small fixes to various fbdev drivers
       - Remove fb_rotate, which was never used
       - pmag fb improvements
      * tag 'fbdev-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (21 commits)
        xen kconfig: don't "select INPUT_XEN_KBDDEV_FRONTEND"
        video: fbdev: sis: remove unused variable
        drivers/video: make fbdev/sunxvr2500.c explicitly non-modular
        drivers/video: make fbdev/sunxvr1000.c explicitly non-modular
        drivers/video: make fbdev/sunxvr500.c explicitly non-modular
        video: exynos: fix modular build
        fbdev: da8xx-fb: fix videomodes of lcd panels
        fbdev: kill fb_rotate
        video: fbdev: bt431: Correct cursor format control macro
        video: fbdev: pmag-ba-fb: Optimize Bt455 colormap addressing
        video: fbdev: pmag-ba-fb: Fix and rework Bt455 colormap handling
        video: fbdev: bt455: Remove unneeded colormap helpers for cursor support
        video: fbdev: pmag-aa-fb: Report video timings
        video: fbdev: pmag-aa-fb: Enable building as a module
        video: fbdev: pmag-aa-fb: Adapt to current APIs
        video: fbdev: pmag-ba-fb: Fix the lower margin size
        fbdev: sh_mobile_lcdc: Use ARCH_RENESAS
        fbdev: n411: check return value
        fbdev: exynos: fix IS_ERR_VALUE usage
        video: Use bool instead int pointer for get_opt_bool() argument
    • Linus Torvalds's avatar
      Merge tag 'media/v4.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · bace3db5
      Linus Torvalds authored
      Pull media updates from Mauro Carvalho Chehab:
       - Added support for some new video formats
       - mn88473 DVB frontend driver got promoted from staging
       - several improvements at the VSP1 driver
       - several cleanups and improvements at the Media Controller
       - added Media Controller support to snd-usb-audio.  Currently, enabled
         only for au0828-based V4L2/DVB boards
       - Several improvements at nuvoton-cir: it now supports wake up codes
       - Add media controller support to em28xx and saa7134 drivers
       - coda driver now accepts NXP distributed firmware files
       - Some legacy SoC camera drivers will be moving to staging, as they're
         outdated and nobody so far is willing to fix and convert them to use
         the current media framework
       - As usual, lots of cleanups, improvements and new board additions.
      * tag 'media/v4.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (381 commits)
        media: au0828 disable tuner to demod link in au0828_media_device_register()
        [media] touptek: cast char types on %x printk
        [media] touptek: don't DMA at the stack
        [media] mceusb: use %*ph for small buffer dumps
        [media] v4l: exynos4-is: Drop unneeded check when setting up fimc-lite links
        [media] v4l: vsp1: Check if an entity is a subdev with the right function
        [media] hide unused functions for !MEDIA_CONTROLLER
        [media] em28xx: fix Terratec Grabby AC97 codec detection
        [media] media: add prefixes to interface types
        [media] media: rc: nuvoton: switch attribute wakeup_data to text
        [media] v4l2-ioctl: fix YUV422P pixel format description
        [media] media: fix null pointer dereference in v4l_vb2q_enable_media_source()
        [media] v4l2-mc.h: fix yet more compiler errors
        [media] staging/media: add missing TODO files
        [media] media.h: always start with 1 for the audio entities
        [media] sound/usb: Use meaninful names for goto labels
        [media] v4l2-mc.h: fix compiler warnings
        [media] media: au0828 audio mixer isn't connected to decoder
        [media] sound/usb: Use Media Controller API to share media resources
        [media] dw2102: add support for TeVii S662
    • Linus Torvalds's avatar
      Merge tag 'libnvdimm-for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm · 8759957b
      Linus Torvalds authored
      Pull libnvdimm updates from Dan Williams:
       - Asynchronous address range scrub:
           Given the capacities of next generation persistent memory devices a
           scrub operation to find all poison may take 10s of seconds.  We
           want this scrub work to be done asynchronously with the rest of
           system initialization, so we move it out of line from the NFIT
           probing, i.e. acpi_nfit_add().
       - Clear poison:
           ACPI 6.1 introduces the ability to send "clear error" commands to
           the ACPI0012:00 device representing the root of an "nvdimm bus".
           Similar to relocating a bad block on a disk, this support clears
           media errors in response to a write.
       - Persistent memory resource tracking:
           A persistent memory range may be designated as simply "reserved" by
           platform firmware in the efi/e820 memory map.  Later when the NFIT
           driver loads it discovers that the range is "Persistent Memory".
           The NFIT bus driver inserts a resource to advertise that
           "persistent" attribute in the system resource tree for /proc/iomem
           and kernel-internal usages.
       - Miscellaneous cleanups and fixes:
           Workaround section misaligned pmem ranges when allocating a struct
           page memmap, fix handling of the read-only case in the ioctl path,
           and clean up block device major number allocation.
      * tag 'libnvdimm-for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: (26 commits)
        libnvdimm, pmem: clear poison on write
        libnvdimm, pmem: fix kmap_atomic() leak in error path
        nvdimm/btt: don't allocate unused major device number
        nvdimm/blk: don't allocate unused major device number
        pmem: don't allocate unused major device number
        ACPI: Change NFIT driver to insert new resource
        resource: Export insert_resource and remove_resource
        resource: Add remove_resource interface
        resource: Change __request_region to inherit from immediate parent
        libnvdimm, pmem: fix ia64 build, use PHYS_PFN
        nfit, libnvdimm: clear poison command support
        libnvdimm, pfn: 'resource'-address and 'size' attributes for pfn devices
        libnvdimm, pmem: adjust for section collisions with 'System RAM'
        libnvdimm, pmem: fix 'pfn' support for section-misaligned namespaces
        libnvdimm: Fix security issue with DSM IOCTL.
        libnvdimm: Clean-up access mode check.
        tools/testing/nvdimm: expand ars unit testing
        nfit: disable userspace initiated ars during scrub
        nfit: scrub and register regions in a workqueue
        nfit, libnvdimm: async region scrub workqueue
    • Linus Torvalds's avatar
      Merge tag 'dm-4.6-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm · 6968e6f8
      Linus Torvalds authored
      Pull device mapper updates from Mike Snitzer:
       - Most attention this cycle went to optimizing blk-mq request-based DM
         (dm-mq) that is used exclussively by DM multipath:
           - A stable fix for dm-mq that eliminates excessive context
             switching offers the biggest performance improvement (for both
             IOPs and throughput).
           - But more work is needed, during the next cycle, to reduce
             spinlock contention in DM multipath on large NUMA systems.
       - A stable fix for a NULL pointer seen when DM stats is enabled on a DM
         multipath device that must requeue an IO due to path failure.
       - A stable fix for DM snapshot to disallow the COW and origin devices
         from being identical.  This amounts to graceful failure in the face
         of userspace error because these devices shouldn't ever be identical.
       - Stable fixes for DM cache and DM thin provisioning to address crashes
         seen if/when their respective metadata device experiences failures
         that cause the transition to 'fail_io' mode.
       - The DM cache 'mq' policy is now an alias for the 'smq' policy.  The
         'smq' policy proved to be consistently better than 'mq'.  As such
         'mq', with all its complex user-facing tunables, has been eliminated.
       - Improve DM thin provisioning to consistently return -ENOSPC once the
         thin-pool's data volume is out of space.
       - Improve DM core to properly handle error propagation if
         bio_integrity_clone() fails in clone_bio().
       - Other small cleanups and improvements to DM core.
      * tag 'dm-4.6-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm: (41 commits)
        dm: fix rq_end_stats() NULL pointer in dm_requeue_original_request()
        dm thin: consistently return -ENOSPC if pool has run out of data space
        dm cache: bump the target version
        dm cache: make sure every metadata function checks fail_io
        dm: add missing newline between DM_DEBUG_BLOCK_STACK_TRACING and DM_BUFIO
        dm cache policy smq: clarify that mq registration failure was for 'mq'
        dm: return error if bio_integrity_clone() fails in clone_bio()
        dm thin metadata: don't issue prefetches if a transaction abort has failed
        dm snapshot: disallow the COW and origin devices from being identical
        dm cache: make the 'mq' policy an alias for 'smq'
        dm: drop unnecessary assignment of md->queue
        dm: reorder 'struct mapped_device' members to fix alignment and holes
        dm: remove dummy definition of 'struct dm_table'
        dm: add 'dm_numa_node' module parameter
        dm thin metadata: remove needless newline from subtree_dec() DMERR message
        dm mpath: cleanup reinstate_path() et al based on code review
        dm mpath: remove __pgpath_busy forward declaration, rename to pgpath_busy
        dm mpath: switch from 'unsigned' to 'bool' for flags where appropriate
        dm round robin: use percpu 'repeat_count' and 'current_path'
        dm path selector: remove 'repeat_count' return from .select_path hook
    • Linus Torvalds's avatar
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · cae8da04
      Linus Torvalds authored
      Pull SCSI updates from James Bottomley:
       "This pull includes driver updates from the usual suspects (stex, hpsa,
        ncr5380, scsi_dh, qla2xxx, be2iscsi, hisi_sas, cxlflash, aacraid,
        mp3sas, megaraid_sas, ibmvscsi, ufs) plus an assortment of
        miscellaneous fixes.
        The major user visible change of this pull is that we've moved from
        monotonically increasing host number to an ida allocated one (meaning
        the numbers get re-used) because someone managed to wrap the count in
        an iscsi system.  We don't believe there will be any adverse
        consequences of this"
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (230 commits)
        MAINTAINERS: use new email address for James Bottomley
        mpt3sas: Remove unnecessary synchronize_irq() before free_irq()
        sg: fix dxferp in from_to case
        cxlflash: Increase cmd_per_lun for better throughput
        cxlflash: Fix to avoid unnecessary scan with internal LUNs
        cxlflash: Reorder user context initialization
        cxlflash: Simplify attach path error cleanup
        cxlflash: Split out context initialization
        cxlflash: Unmap problem state area before detaching master context
        cxlflash: Simplify PCI registration
        scsi: storvsc: fix SRB_STATUS_ABORTED handling
        be2iscsi: set the boot_kset pointer to NULL in case of failure
        sd: Fix discard granularity when LBPRZ=1
        be2iscsi: Remove unnecessary synchronize_irq() before free_irq()
        scsi_sysfs: call 'device_add' after attaching device handler
        scsi_dh_emc: update 'access_state' field
        scsi_dh_rdac: update 'access_state' field
        scsi_dh_alua: update 'access_state' field
        scsi_dh_alua: use common definitions for ALUA state
        scsi: Add 'access_state' and 'preferred_path' attribute
    • Linus Torvalds's avatar
      Merge branch 'stable/for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft · 7bb7a748
      Linus Torvalds authored
      Pull iscsi_ibft update from Konrad Rzeszutek Wilk:
       "A simple patch that had been rattling around in SuSE repo"
      * 'stable/for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft:
        iscsi_ibft: Add prefix-len attr and display netmask
    • Linus Torvalds's avatar
      Merge tag 'pci-v4.6-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 63e30271
      Linus Torvalds authored
      Pull PCI updates from Bjorn Helgaas:
       "PCI changes for v4.6:
         - Disable IO/MEM decoding for devices with non-compliant BARs (Bjorn Helgaas)
         - Mark Broadwell-EP Home Agent & PCU as having non-compliant BARs (Bjorn Helgaas
        Resource management:
         - Mark shadow copy of VGA ROM as IORESOURCE_PCI_FIXED (Bjorn Helgaas)
         - Don't assign or reassign immutable resources (Bjorn Helgaas)
         - Don't enable/disable ROM BAR if we're using a RAM shadow copy (Bjorn Helgaas)
         - Set ROM shadow location in arch code, not in PCI core (Bjorn Helgaas)
         - Remove arch-specific IORESOURCE_ROM_SHADOW size from sysfs (Bjorn Helgaas)
         - ia64: Use ioremap() instead of open-coded equivalent (Bjorn Helgaas)
         - ia64: Keep CPU physical (not virtual) addresses in shadow ROM resource (Bjorn Helgaas)
         - MIPS: Keep CPU physical (not virtual) addresses in shadow ROM resource (Bjorn Helgaas)
         - Remove unused IORESOURCE_ROM_COPY and IORESOURCE_ROM_BIOS_COPY (Bjorn Helgaas)
         - Don't leak memory if sysfs_create_bin_file() fails (Bjorn Helgaas)
         - rcar: Remove PCI_PROBE_ONLY handling (Lorenzo Pieralisi)
         - designware: Remove PCI_PROBE_ONLY handling (Lorenzo Pieralisi)
         - Wait for up to 1000ms after FLR reset (Alex Williamson)
         - Support SR-IOV on any function type (Kelly Zytaruk)
         - Add ACS quirk for all Cavium devices (Manish Jaggi)
         - Rename pci_ops_aer to aer_inj_pci_ops (Bjorn Helgaas)
         - Restore pci_ops pointer while calling original pci_ops (David Daney)
         - Fix aer_inject error codes (Jean Delvare)
         - Use dev_warn() in aer_inject (Jean Delvare)
         - Log actual error causes in aer_inject (Jean Delvare)
         - Log aer_inject error injections (Jean Delvare)
         - Prevent VPD access for buggy devices (Babu Moger)
         - Move pci_read_vpd() and pci_write_vpd() close to other VPD code (Bjorn Helgaas)
         - Move pci_vpd_release() from header file to pci/access.c (Bjorn Helgaas)
         - Remove struct pci_vpd_ops.release function pointer (Bjorn Helgaas)
         - Rename VPD symbols to remove unnecessary "pci22" (Bjorn Helgaas)
         - Fold struct pci_vpd_pci22 into struct pci_vpd (Bjorn Helgaas)
         - Sleep rather than busy-wait for VPD access completion (Bjorn Helgaas)
         - Update VPD definitions (Hannes Reinecke)
         - Allow access to VPD attributes with size 0 (Hannes Reinecke)
         - Determine actual VPD size on first access (Hannes Reinecke)
        Generic host bridge driver:
         - Move structure definitions to separate header file (David Daney)
         - Add pci_host_common_probe(), based on gen_pci_probe() (David Daney)
         - Expose pci_host_common_probe() for use by other drivers (David Daney)
        Altera host bridge driver:
         - Fix altera_pcie_link_is_up() (Ley Foon Tan)
        Cavium ThunderX host bridge driver:
         - Add PCIe host driver for ThunderX processors (David Daney)
         - Add driver for ThunderX-pass{1,2} on-chip devices (David Daney)
        Freescale i.MX6 host bridge driver:
         - Add DT bindings to configure PHY Tx driver settings (Justin Waters)
         - Move imx6_pcie_reset_phy() near other PHY handling functions (Lucas Stach)
         - Move PHY reset into imx6_pcie_establish_link() (Lucas Stach)
         - Remove broken Gen2 workaround (Lucas Stach)
         - Move link up check into imx6_pcie_wait_for_link() (Lucas Stach)
        Freescale Layerscape host bridge driver:
         - Add "fsl,ls2085a-pcie" compatible ID (Yang Shi)
        Intel VMD host bridge driver:
         - Attach VMD resources to parent domain's resource tree (Jon Derrick)
         - Set bus resource start to 0 (Keith Busch)
        Microsoft Hyper-V host bridge driver:
         - Add fwnode_handle to x86 pci_sysdata (Jake Oshins)
         - Look up IRQ domain by fwnode_handle (Jake Oshins)
         - Add paravirtual PCI front-end for Microsoft Hyper-V VMs (Jake Oshins)
        NVIDIA Tegra host bridge driver:
         - Add pci_ops.{add,remove}_bus() callbacks (Thierry Reding)
         - Implement ->{add,remove}_bus() callbacks (Thierry Reding)
         - Remove unused struct tegra_pcie.num_ports field (Thierry Reding)
         - Track bus -> CPU mapping (Thierry Reding)
         - Remove misleading PHYS_OFFSET (Thierry Reding)
        Renesas R-Car host bridge driver:
         - Depend on ARCH_RENESAS, not ARCH_SHMOBILE (Simon Horman)
        Synopsys DesignWare host bridge driver:
         - ARC: Add PCI support (Joao Pinto)
         - Add generic dw_pcie_wait_for_link() (Joao Pinto)
         - Add default link up check if sub-driver doesn't override (Joao Pinto)
         - Add driver for prototyping kits based on ARC SDP (Joao Pinto)
        TI Keystone host bridge driver:
         - Defer probing if devm_phy_get() returns -EPROBE_DEFER (Shawn Lin)
        Xilinx AXI host bridge driver:
         - Use of_pci_get_host_bridge_resources() to parse DT (Bharat Kumar Gogada)
         - Remove dependency on ARM-specific struct hw_pci (Bharat Kumar Gogada)
         - Don't call pci_fixup_irqs() on Microblaze (Bharat Kumar Gogada)
         - Update Zynq binding with Microblaze node (Bharat Kumar Gogada)
         - microblaze: Support generic Xilinx AXI PCIe Host Bridge IP driver (Bharat Kumar Gogada)
        Xilinx NWL host bridge driver:
         - Add support for Xilinx NWL PCIe Host Controller (Bharat Kumar Gogada)
         - Check device_attach() return value always (Bjorn Helgaas)
         - Move pci_set_flags() from asm-generic/pci-bridge.h to linux/pci.h (Bjorn Helgaas)
         - Remove includes of empty asm-generic/pci-bridge.h (Bjorn Helgaas)
         - ARM64: Remove generated include of asm-generic/pci-bridge.h (Bjorn Helgaas)
         - Remove empty asm-generic/pci-bridge.h (Bjorn Helgaas)
         - Remove includes of asm/pci-bridge.h (Bjorn Helgaas)
         - Consolidate PCI DMA constants and interfaces in linux/pci-dma-compat.h (Bjorn Helgaas)
         - unicore32: Remove unused HAVE_ARCH_PCI_SET_DMA_MASK definition (Bjorn Helgaas)
         - Cleanup pci/pcie/Kconfig whitespace (Andreas Ziegler)
         - Include pci/hotplug Kconfig directly from pci/Kconfig (Bjorn Helgaas)
         - Include pci/pcie/Kconfig directly from pci/Kconfig (Bogicevic Sasa)
         - frv: Remove stray pci_{alloc,free}_consistent() declaration (Christoph Hellwig)
         - Move pci_dma_* helpers to common code (Christoph Hellwig)
         - Add PCI_CLASS_SERIAL_USB_DEVICE definition (Heikki Krogerus)
         - Add QEMU top-level IDs for (sub)vendor & device (Robin H. Johnson)
         - Fix broken URL for Dell biosdevname (Naga Venkata Sai Indubhaskar Jupudi)"
      * tag 'pci-v4.6-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (94 commits)
        PCI: Add PCI_CLASS_SERIAL_USB_DEVICE definition
        PCI: designware: Add driver for prototyping kits based on ARC SDP
        PCI: designware: Add default link up check if sub-driver doesn't override
        PCI: designware: Add generic dw_pcie_wait_for_link()
        PCI: Cleanup pci/pcie/Kconfig whitespace
        PCI: Simplify pci_create_attr() control flow
        PCI: Don't leak memory if sysfs_create_bin_file() fails
        PCI: Simplify sysfs ROM cleanup
        MIPS: Loongson 3: Keep CPU physical (not virtual) addresses in shadow ROM resource
        MIPS: Loongson 3: Use temporary struct resource * to avoid repetition
        ia64/PCI: Keep CPU physical (not virtual) addresses in shadow ROM resource
        ia64/PCI: Use ioremap() instead of open-coded equivalent
        ia64/PCI: Use temporary struct resource * to avoid repetition
        PCI: Clean up pci_map_rom() whitespace
        PCI: Remove arch-specific IORESOURCE_ROM_SHADOW size from sysfs
        PCI: thunder: Add driver for ThunderX-pass{1,2} on-chip devices
        PCI: thunder: Add PCIe host driver for ThunderX processors
        PCI: generic: Expose pci_host_common_probe() for use by other drivers
        PCI: generic: Add pci_host_common_probe(), based on gen_pci_probe()
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-4.6-rc1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 277edbab
      Linus Torvalds authored
      Pull power management and ACPI updates from Rafael Wysocki:
       "This time the majority of changes go into cpufreq and they are
        First off, the way CPU frequency updates are triggered is different
        now.  Instead of having to set up and manage a deferrable timer for
        each CPU in the system to evaluate and possibly change its frequency
        periodically, cpufreq governors set up callbacks to be invoked by the
        scheduler on a regular basis (basically on utilization updates).  The
        "old" governors, "ondemand" and "conservative", still do all of their
        work in process context (although that is triggered by the scheduler
        now), but intel_pstate does it all in the callback invoked by the
        scheduler with no need for any additional asynchronous processing.
        Of course, this eliminates the overhead related to the management of
        all those timers, but also it allows the cpufreq governor code to be
        simplified quite a bit.  On top of that, the common code and data
        structures used by the "ondemand" and "conservative" governors are
        cleaned up and made more straightforward and some long-standing and
        quite annoying problems are addressed.  In particular, the handling of
        governor sysfs attributes is modified and the related locking becomes
        more fine grained which allows some concurrency problems to be avoided
        (particularly deadlocks with the core cpufreq code).
        In principle, the new mechanism for triggering frequency updates
        allows utilization information to be passed from the scheduler to
        cpufreq.  Although the current code doesn't make use of it, in the
        works is a new cpufreq governor that will make decisions based on the
        scheduler's utilization data.  That should allow the scheduler and
        cpufreq to work more closely together in the long run.
        In addition to the core and governor changes, cpufreq drivers are
        updated too.  Fixes and optimizations go into intel_pstate, the
        cpufreq-dt driver is updated on top of some modification in the
        Operating Performance Points (OPP) framework and there are fixes and
        other updates in the powernv cpufreq driver.
        Apart from the cpufreq updates there is some new ACPICA material,
        including a fix for a problem introduced by previous ACPICA updates,
        and some less significant changes in the ACPI code, like CPPC code
        optimizations, ACPI processor driver cleanups and support for loading
        ACPI tables from initrd.
        Also updated are the generic power domains framework, the Intel RAPL
        power capping driver and the turbostat utility and we have a bunch of
        traditional assorted fixes and cleanups.
         - Redesign of cpufreq governors and the intel_pstate driver to make
           them use callbacks invoked by the scheduler to trigger CPU
           frequency evaluation instead of using per-CPU deferrable timers for
           that purpose (Rafael Wysocki).
         - Reorganization and cleanup of cpufreq governor code to make it more
           straightforward and fix some concurrency problems in it (Rafael
           Wysocki, Viresh Kumar).
         - Cleanup and improvements of locking in the cpufreq core (Viresh
         - Assorted cleanups in the cpufreq core (Rafael Wysocki, Viresh
           Kumar, Eric Biggers).
         - intel_pstate driver updates including fixes, optimizations and a
           modification to make it enable enable hardware-coordinated P-state
           selection (HWP) by default if supported by the processor (Philippe
           Longepe, Srinivas Pandruvada, Rafael Wysocki, Viresh Kumar, Felipe
         - Operating Performance Points (OPP) framework updates to improve its
           handling of voltage regulators and device clocks and updates of the
           cpufreq-dt driver on top of that (Viresh Kumar, Jon Hunter).
         - Updates of the powernv cpufreq driver to fix initialization and
           cleanup problems in it and correct its worker thread handling with
           respect to CPU offline, new powernv_throttle tracepoint (Shilpasri
         - ACPI cpufreq driver optimization and cleanup (Rafael Wysocki).
         - ACPICA updates including one fix for a regression introduced by
           previos changes in the ACPICA code (Bob Moore, Lv Zheng, David Box,
           Colin Ian King).
         - Support for installing ACPI tables from initrd (Lv Zheng).
         - Optimizations of the ACPI CPPC code (Prashanth Prakash, Ashwin
         - Support for _HID(ACPI0010) devices (ACPI processor containers) and
           ACPI processor driver cleanups (Sudeep Holla).
         - Support for ACPI-based enumeration of the AMBA bus (Graeme Gregory,
           Aleksey Makarov).
         - Modification of the ACPI PCI IRQ management code to make it treat
           255 in the Interrupt Line register as "not connected" on x86 (as
           per the specification) and avoid attempts to use that value as a
           valid interrupt vector (Chen Fan).
         - ACPI APEI fixes related to resource leaks (Josh Hunt).
         - Removal of modularity from a few ACPI drivers (BGRT, GHES,
           intel_pmic_crc) that cannot be built as modules in practice (Paul
         - PNP framework update to make it treat ACPI_RESOURCE_TYPE_SERIAL_BUS
           as a valid resource type (Harb Abdulhamid).
         - New device ID (future AMD I2C controller) in the ACPI driver for
           AMD SoCs (APD) and in the designware I2C driver (Xiangliang Yu).
         - Assorted ACPI cleanups (Colin Ian King, Kaiyen Chang, Oleg Drokin).
         - cpuidle menu governor optimization to avoid a square root
           computation in it (Rasmus Villemoes).
         - Fix for potential use-after-free in the generic device properties
           framework (Heikki Krogerus).
         - Updates of the generic power domains (genpd) framework including
           support for multiple power states of a domain, fixes and debugfs
           output improvements (Axel Haslam, Jon Hunter, Laurent Pinchart,
           Geert Uytterhoeven).
         - Intel RAPL power capping driver updates to reduce IPI overhead in
           it (Jacob Pan).
         - System suspend/hibernation code cleanups (Eric Biggers, Saurabh
         - Year 2038 fix for the process freezer (Abhilash Jindal).
         - turbostat utility updates including new features (decoding of more
           registers and CPUID fields, sub-second intervals support, GFX MHz
           and RC6 printout, --out command line option), fixes (syscall jitter
           detection and workaround, reductioin of the number of syscalls
           made, fixes related to Xeon x200 processors, compiler warning
           fixes) and cleanups (Len Brown, Hubert Chrzaniuk, Chen Yu)"
      * tag 'pm+acpi-4.6-rc1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (182 commits)
        tools/power turbostat: bugfix: TDP MSRs print bits fixing
        tools/power turbostat: correct output for MSR_NHM_SNB_PKG_CST_CFG_CTL dump
        tools/power turbostat: call __cpuid() instead of __get_cpuid()
        tools/power turbostat: indicate SMX and SGX support
        tools/power turbostat: detect and work around syscall jitter
        tools/power turbostat: show GFX%rc6
        tools/power turbostat: show GFXMHz
        tools/power turbostat: show IRQs per CPU
        tools/power turbostat: make fewer systems calls
        tools/power turbostat: fix compiler warnings
        tools/power turbostat: add --out option for saving output in a file
        tools/power turbostat: re-name "%Busy" field to "Busy%"
        tools/power turbostat: Intel Xeon x200: fix turbo-ratio decoding
        tools/power turbostat: Intel Xeon x200: fix erroneous bclk value
        tools/power turbostat: allow sub-sec intervals
        ACPI / APEI: ERST: Fixed leaked resources in erst_init
        ACPI / APEI: Fix leaked resources
        intel_pstate: Do not skip samples partially
        intel_pstate: Remove freq calculation from intel_pstate_calc_busy()
        intel_pstate: Move intel_pstate_calc_busy() into get_target_pstate_use_performance()
    • Linus Torvalds's avatar
      Merge branch 'akpm' (patches from Andrew) · 271ecc52
      Linus Torvalds authored
      Merge first patch-bomb from Andrew Morton:
       - some misc things
       - ofs2 updates
       - about half of MM
       - checkpatch updates
       - autofs4 update
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (120 commits)
        autofs4: fix string.h include in auto_dev-ioctl.h
        autofs4: use pr_xxx() macros directly for logging
        autofs4: change log print macros to not insert newline
        autofs4: make autofs log prints consistent
        autofs4: fix some white space errors
        autofs4: fix invalid ioctl return in autofs4_root_ioctl_unlocked()
        autofs4: fix coding style line length in autofs4_wait()
        autofs4: fix coding style problem in autofs4_get_set_timeout()
        autofs4: coding style fixes
        autofs: show pipe inode in mount options
        kallsyms: add support for relative offsets in kallsyms address table
        kallsyms: don't overload absolute symbol type for percpu symbols
        x86: kallsyms: disable absolute percpu symbols on !SMP
        checkpatch: fix another left brace warning
        checkpatch: improve UNSPECIFIED_INT test for bare signed/unsigned uses
        checkpatch: warn on bare unsigned or signed declarations without int
        checkpatch: exclude asm volatile from complex macro check
        mm: memcontrol: drop unnecessary lru locking from mem_cgroup_migrate()
        mm: migrate: consolidate mem_cgroup_migrate() calls
        mm/compaction: speed up pageblock_pfn_to_page() when zone is contiguous
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · aa6865d8
      Linus Torvalds authored
      Pull m68k updates from Geert Uytterhoeven.
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68k: Fix misspellings in comments.
        m68k: Use conventional function parameters for do_sigreturn
        zorro: Use kobj_to_dev()
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 72aafdf0
      Linus Torvalds authored
      Pull s390 updates from Martin Schwidefsky:
       - Add the CPU id for the new z13s machine
       - Add a s390 specific XOR template for RAID-5 checksumming based on the
         XC instruction.  Remove all other alternatives, XC is always faster
       - The merge of our four different stack tracers into a single one
       - Tidy up the code related to page tables, several large inline
         functions are now out-of-line.  Bloat-o-meter reports ~11K text size
       - A binary interface for the priviledged CLP instruction to retrieve
         the hardware view of the installed PCI functions
       - Improvements for the dasd format code
       - Bug fixes and cleanups
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (31 commits)
        s390/pci: enforce fmb page boundary rule
        s390: fix floating pointer register corruption (again)
        s390/cpumf: add missing lpp magic initialization
        s390: Fix misspellings in comments
        s390/mm: split arch/s390/mm/pgtable.c
        s390/mm: uninline pmdp_xxx functions from pgtable.h
        s390/mm: uninline ptep_xxx functions from pgtable.h
        s390/pci: add ioctl interface for CLP
        s390: Use pr_warn instead of pr_warning
        s390/dasd: remove casts to dasd_*_private
        s390/dasd: Refactor dasd format functions
        s390/dasd: Simplify code in format logic
        s390/dasd: Improve dasd format code
        s390/percpu: remove this_cpu_cmpxchg_double_4
        s390/cpumf: Improve guest detection heuristics
        s390/fault: merge report_user_fault implementations
        s390/dis: use correct escape sequence for '%' character
        s390/kvm: simplify set_guest_storage_key
        s390/oprofile: add z13/z13s model numbers
        s390: add z13s model number to z13 elf platform
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32 · 1c8e85b1
      Linus Torvalds authored
      Pull AVR32 updates from Hans-Christian Egtvedt.
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
        avr32: fix asm operand constraint in cmpxchg()
        avr32: wire up copy_file_range syscall
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 10dc3747
      Linus Torvalds authored
      Pull KVM updates from Paolo Bonzini:
       "One of the largest releases for KVM...  Hardly any generic
        changes, but lots of architecture-specific updates.
         - VHE support so that we can run the kernel at EL2 on ARMv8.1 systems
         - PMU support for guests
         - 32bit world switch rewritten in C
         - various optimizations to the vgic save/restore code.
         - enabled KVM-VFIO integration ("VFIO device")
         - optimizations to speed up IPIs between vcpus
         - in-kernel handling of IOMMU hypercalls
         - support for dynamic DMA windows (DDW).
         - provide the floating point registers via sync regs;
         - separated instruction vs.  data accesses
         - dirty log improvements for huge guests
         - bugfixes and documentation improvements.
         - Hyper-V VMBus hypercall userspace exit
         - alternative implementation of lowest-priority interrupts using
           vector hashing (for better VT-d posted interrupt support)
         - fixed guest debugging with nested virtualizations
         - improved interrupt tracking in the in-kernel IOAPIC
         - generic infrastructure for tracking writes to guest
           memory - currently its only use is to speedup the legacy shadow
           paging (pre-EPT) case, but in the future it will be used for
           virtual GPUs as well
         - much cleanup (LAPIC, kvmclock, MMU, PIT), including ubsan fixes"
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (217 commits)
        KVM: x86: remove eager_fpu field of struct kvm_vcpu_arch
        KVM: x86: disable MPX if host did not enable MPX XSAVE features
        arm64: KVM: vgic-v3: Only wipe LRs on vcpu exit
        arm64: KVM: vgic-v3: Reset LRs at boot time
        arm64: KVM: vgic-v3: Do not save an LR known to be empty
        arm64: KVM: vgic-v3: Save maintenance interrupt state only if required
        arm64: KVM: vgic-v3: Avoid accessing ICH registers
        KVM: arm/arm64: vgic-v2: Make GICD_SGIR quicker to hit
        KVM: arm/arm64: vgic-v2: Only wipe LRs on vcpu exit
        KVM: arm/arm64: vgic-v2: Reset LRs at boot time
        KVM: arm/arm64: vgic-v2: Do not save an LR known to be empty
        KVM: arm/arm64: vgic-v2: Move GICH_ELRSR saving to its own function
        KVM: arm/arm64: vgic-v2: Save maintenance interrupt state only if required
        KVM: arm/arm64: vgic-v2: Avoid accessing GICH registers
        KVM: s390: allocate only one DMA page per VM
        KVM: s390: enable STFLE interpretation only if enabled for the guest
        KVM: s390: wake up when the VCPU cpu timer expires
        KVM: s390: step the VCPU timer while in enabled wait
        KVM: s390: protect VCPU cpu timer with a seqcount
        KVM: s390: step VCPU cpu timer during kvm_run ioctl
    • Linus Torvalds's avatar
      Merge tag 'edac_for_4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · 047486d8
      Linus Torvalds authored
      Pull EDAC updates from Borislav Petkov:
       - Altera: L2 cache and On-Chip RAM support (Thor Thayer).
       - EDAC: Workqueue handling cleanups (Borislav Petkov).
       - Xgene: Register bus error handling (Loc Ho).
       - Misc small fixes.
      * tag 'edac_for_4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        ARM: socfpga: Enable OCRAM ECC on startup
        ARM: socfpga: Enable L2 cache ECC on startup
        ARM: dts: Add Altera L2 Cache and OCRAM EDAC entries
        EDAC, altera: Add Altera L2 cache and OCRAM support
        EDAC: Use edac_debugfs_remove_recursive() in edac_debugfs_exit()
        EDAC, mpc85xx: Silence unused variable warning
        EDAC: Cleanup/sync workqueue functions
        EDAC: Kill workqueue setup/teardown functions
        EDAC: Balance workqueue setup and teardown
        arm64: Update the APM X-Gene EDAC node with the RB register resource
        EDAC, xgene: Add missing SoC register bus error handling
        Documentation, EDAC: Update xgene binding for missing register bus
        EDAC, amd64_edac: Shift wrapping issue in f1x_get_norm_dct_addr()
    • Phil Reid's avatar
      gpio: mcp23s08: Fix clearing of interrupt. · 3539699c
      Phil Reid authored
      The mcp23s18 is configurable on clearing the interrupt on either reading
      INTCAP or GPIO. Since driver reads INTCAP in IRQ and not the GPIO reg need
      to set control byte for this mode.
      Signed-off-by: default avatarPhil Reid <preid@electromag.com.au>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
    • Geert Uytterhoeven's avatar
      gpiolib: Fix comment referring to gpio_*() in gpiod_*() · 1cfab8f8
      Geert Uytterhoeven authored
      Fixes: 79a9becd
       ("gpiolib: export descriptor-based GPIO interface")
      Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>