1. 08 Feb, 2018 12 commits
    • Linus Torvalds's avatar
      Merge tag 'gcc-plugins-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · 4ed8244e
      Linus Torvalds authored
      Pull gcc plugins updates from Kees Cook:
      
       - update includes for gcc 8 (Valdis Kletnieks)
      
       - update initializers for gcc 8
      
      * tag 'gcc-plugins-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        gcc-plugins: Use dynamic initializers
        gcc-plugins: Add include required by GCC release 8
      4ed8244e
    • Linus Torvalds's avatar
      Merge tag 'for-linus-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux · a0f79386
      Linus Torvalds authored
      Pull orangefs updates from Mike Marshall:
       "Mostly cleanups, but three bug fixes:
      
         - don't pass garbage return codes back up the call chain (Mike
           Marshall)
      
         - fix stale inode test (Martin Brandenburg)
      
         - fix off-by-one errors (Xiongfeng Wang)
      
        Also add Martin as a reviewer in the Maintainers file"
      
      * tag 'for-linus-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
        orangefs: reverse sense of is-inode-stale test in d_revalidate
        orangefs: simplify orangefs_inode_is_stale
        Orangefs: don't propogate whacky error codes
        orangefs: use correct string length
        orangefs: make orangefs_make_bad_inode static
        orangefs: remove ORANGEFS_KERNEL_DEBUG
        orangefs: remove gossip_ldebug and gossip_lerr
        orangefs: make orangefs_client_debug_init static
        MAINTAINERS: update orangefs list and add myself as reviewer
      a0f79386
    • Linus Torvalds's avatar
      Merge tag 'afs-next-20180208' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs · 81153336
      Linus Torvalds authored
      Pull afs updates from David Howells:
       "Four fixes:
      
         - add a missing put
      
         - two fixes to reset the address iteration cursor correctly
      
         - fix setting up the fileserver iteration cursor.
      
        Two cleanups:
      
         - remove some dead code
      
         - rearrange a function to be more logically laid out
      
        And one new feature:
      
         - Support AFS dynamic root.
      
           With this one should be able to do, say:
      
              mkdir /afs
              mount -t afs none /afs -o dyn
      
           to create a dynamic root and then, provided you have keyutils
           installed, do:
      
              ls /afs/grand.central.org
      
           and:
      
              ls /afs/umich.edu
      
           to list the root volumes of both those organisations' AFS cells
           without requiring any other setup (the kernel upcall to a program
           in the keyutils package to do DNS access as does NFS)"
      
      * tag 'afs-next-20180208' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
        afs: Support the AFS dynamic root
        afs: Rearrange afs_select_fileserver() a little
        afs: Remove unused code
        afs: Fix server list handling
        afs: Need to clear responded flag in addr cursor
        afs: Fix missing cursor clearance
        afs: Add missing afs_put_cell()
      81153336
    • Linus Torvalds's avatar
      Merge tag 'iommu-updates-v4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · ef9417e8
      Linus Torvalds authored
      Pull IOMMU updates from Joerg Roedel:
       "This time there are not a lot of changes coming from the IOMMU side.
      
        That is partly because I returned from my parental leave late in the
        development process and probably partly because everyone was busy with
        Spectre and Meltdown mitigation work and didn't find the time for
        IOMMU work. So here are the few changes that queued up for this merge
        window:
      
         - 5-level page-table support for the Intel IOMMU.
      
         - error reporting improvements for the AMD IOMMU driver
      
         - additional DT bindings for ipmmu-vmsa (Renesas)
      
         - small fixes and cleanups"
      
      * tag 'iommu-updates-v4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
        iommu: Clean up of_iommu_init_fn
        iommu/ipmmu-vmsa: Remove redundant of_iommu_init_fn hook
        iommu/msm: Claim bus ops on probe
        iommu/vt-d: Enable 5-level paging mode in the PASID entry
        iommu/vt-d: Add a check for 5-level paging support
        iommu/vt-d: Add a check for 1GB page support
        iommu/vt-d: Enable upto 57 bits of domain address width
        iommu/vt-d: Use domain instead of cache fetching
        iommu/exynos: Don't unconditionally steal bus ops
        iommu/omap: Fix debugfs_create_*() usage
        iommu/vt-d: clean up pr_irq if request_threaded_irq fails
        iommu: Check the result of iommu_group_get() for NULL
        iommu/ipmmu-vmsa: Add r8a779(70|95) DT bindings
        iommu/ipmmu-vmsa: Add r8a7796 DT binding
        iommu/amd: Set the device table entry PPR bit for IOMMU V2 devices
        iommu/amd - Record more information about unknown events
      ef9417e8
    • Linus Torvalds's avatar
      Merge branch 'pcmcia' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia · 605dc776
      Linus Torvalds authored
      Pull pcmcia updates from Dominik Brodowski:
       "The linux-pcmcia mailing list was shut down, so offer an alternative
        path for patches in MAINTAINERS.
      
        Also, throw in two odd fixes for the pcmcia subsystem"
      
      * 'pcmcia' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia:
        pcmcia: soc_common: Handle return value of clk_prepare_enable
        pcmcia: use proper printk format for resource
        pcmcia: remove mailing list, update MAINTAINERS
      605dc776
    • Linus Torvalds's avatar
      Merge tag 'drm-for-v4.16-part2-fixes' of git://people.freedesktop.org/~airlied/linux · fe26adf4
      Linus Torvalds authored
      Pull more drm updates from Dave Airlie:
       "Ben missed sending his nouveau tree, but he really didn't have much
        stuff in it:
      
         - GP108 acceleration support is enabled by "secure boot" support
      
         - some clockgating work on Kepler, and bunch of fixes
      
         - the bulk of the diff is regenerated firmware files, the change to
           them really isn't that large.
      
        Otherwise this contains regular Intel and AMDGPU fixes"
      
      * tag 'drm-for-v4.16-part2-fixes' of git://people.freedesktop.org/~airlied/linux: (59 commits)
        drm/i915/bios: add DP max link rate to VBT child device struct
        drm/i915/cnp: Properly handle VBT ddc pin out of bounds.
        drm/i915/cnp: Ignore VBT request for know invalid DDC pin.
        drm/i915/cmdparser: Do not check past the cmd length.
        drm/i915/cmdparser: Check reg_table_count before derefencing.
        drm/i915/bxt, glk: Increase PCODE timeouts during CDCLK freq changing
        drm/i915/gvt: Use KVM r/w to access guest opregion
        drm/i915/gvt: Fix aperture read/write emulation when enable x-no-mmap=on
        drm/i915/gvt: only reset execlist state of one engine during VM engine reset
        drm/i915/gvt: refine intel_vgpu_submission_ops as per engine ops
        drm/amdgpu: re-enable CGCG on CZ and disable on ST
        drm/nouveau/clk: fix gcc-7 -Wint-in-bool-context warning
        drm/nouveau/mmu: Fix trailing semicolon
        drm/nouveau: Introduce NvPmEnableGating option
        drm/nouveau: Add support for SLCG for Kepler2
        drm/nouveau: Add support for BLCG on Kepler2
        drm/nouveau: Add support for BLCG on Kepler1
        drm/nouveau: Add support for basic clockgating on Kepler1
        drm/nouveau/kms/nv50: fix handling of gamma since atomic conversion
        drm/nouveau/kms/nv50: use INTERPOLATE_257_UNITY_RANGE LUT on newer chipsets
        ...
      fe26adf4
    • Linus Torvalds's avatar
      Merge tag 'ceph-for-4.16-rc1' of git://github.com/ceph/ceph-client · 9e95dae7
      Linus Torvalds authored
      Pull ceph updates from Ilya Dryomov:
       "Things have been very quiet on the rbd side, as work continues on the
        big ticket items slated for the next merge window.
      
        On the CephFS side we have a large number of cap handling
        improvements, a fix for our long-standing abuse of ->journal_info in
        ceph_readpages() and yet another dentry pointer management patch"
      
      * tag 'ceph-for-4.16-rc1' of git://github.com/ceph/ceph-client:
        ceph: improving efficiency of syncfs
        libceph: check kstrndup() return value
        ceph: try to allocate enough memory for reserved caps
        ceph: fix race of queuing delayed caps
        ceph: delete unreachable code in ceph_check_caps()
        ceph: limit rate of cap import/export error messages
        ceph: fix incorrect snaprealm when adding caps
        ceph: fix un-balanced fsc->writeback_count update
        ceph: track read contexts in ceph_file_info
        ceph: avoid dereferencing invalid pointer during cached readdir
        ceph: use atomic_t for ceph_inode_info::i_shared_gen
        ceph: cleanup traceless reply handling for rename
        ceph: voluntarily drop Fx cap for readdir request
        ceph: properly drop caps for setattr request
        ceph: voluntarily drop Lx cap for link/rename requests
        ceph: voluntarily drop Ax cap for requests that create new inode
        rbd: whitelist RBD_FEATURE_OPERATIONS feature bit
        rbd: don't NULL out ->obj_request in rbd_img_obj_parent_read_full()
        rbd: use kmem_cache_zalloc() in rbd_img_request_create()
        rbd: obj_request->completion is unused
      9e95dae7
    • Nicolas Pitre's avatar
      cramfs: better MTD dependency expression · a8c6db00
      Nicolas Pitre authored
      Commit b9f5fb18 ("cramfs: fix MTD dependency") did what it says.
      
      Since commit 9059a349 ("kconfig: fix relational operators for bool
      and tristate symbols") it is possible to do it slightly better though.
      Signed-off-by: default avatarNicolas Pitre <nico@linaro.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      a8c6db00
    • Linus Torvalds's avatar
      Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · c0136321
      Linus Torvalds authored
      Pull more arm64 updates from Catalin Marinas:
       "As I mentioned in the last pull request, there's a second batch of
        security updates for arm64 with mitigations for Spectre/v1 and an
        improved one for Spectre/v2 (via a newly defined firmware interface
        API).
      
        Spectre v1 mitigation:
      
         - back-end version of array_index_mask_nospec()
      
         - masking of the syscall number to restrict speculation through the
           syscall table
      
         - masking of __user pointers prior to deference in uaccess routines
      
        Spectre v2 mitigation update:
      
         - using the new firmware SMC calling convention specification update
      
         - removing the current PSCI GET_VERSION firmware call mitigation as
           vendors are deploying new SMCCC-capable firmware
      
         - additional branch predictor hardening for synchronous exceptions
           and interrupts while in user mode
      
        Meltdown v3 mitigation update:
      
          - Cavium Thunder X is unaffected but a hardware erratum gets in the
            way. The kernel now starts with the page tables mapped as global
            and switches to non-global if kpti needs to be enabled.
      
        Other:
      
         - Theoretical trylock bug fixed"
      
      * tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (38 commits)
        arm64: Kill PSCI_GET_VERSION as a variant-2 workaround
        arm64: Add ARM_SMCCC_ARCH_WORKAROUND_1 BP hardening support
        arm/arm64: smccc: Implement SMCCC v1.1 inline primitive
        arm/arm64: smccc: Make function identifiers an unsigned quantity
        firmware/psci: Expose SMCCC version through psci_ops
        firmware/psci: Expose PSCI conduit
        arm64: KVM: Add SMCCC_ARCH_WORKAROUND_1 fast handling
        arm64: KVM: Report SMCCC_ARCH_WORKAROUND_1 BP hardening support
        arm/arm64: KVM: Turn kvm_psci_version into a static inline
        arm/arm64: KVM: Advertise SMCCC v1.1
        arm/arm64: KVM: Implement PSCI 1.0 support
        arm/arm64: KVM: Add smccc accessors to PSCI code
        arm/arm64: KVM: Add PSCI_VERSION helper
        arm/arm64: KVM: Consolidate the PSCI include files
        arm64: KVM: Increment PC after handling an SMC trap
        arm: KVM: Fix SMCCC handling of unimplemented SMC/HVC calls
        arm64: KVM: Fix SMCCC handling of unimplemented SMC/HVC calls
        arm64: entry: Apply BP hardening for suspicious interrupts from EL0
        arm64: entry: Apply BP hardening for high-priority synchronous exceptions
        arm64: futex: Mask __user pointers prior to dereference
        ...
      c0136321
    • Linus Torvalds's avatar
      Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost · 846ade7d
      Linus Torvalds authored
      Pull virtio/vhost updates from Michael Tsirkin:
       "virtio, vhost: fixes, cleanups, features
      
        This includes the disk/cache memory stats for for the virtio balloon,
        as well as multiple fixes and cleanups"
      
      * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
        vhost: don't hold onto file pointer for VHOST_SET_LOG_FD
        vhost: don't hold onto file pointer for VHOST_SET_VRING_ERR
        vhost: don't hold onto file pointer for VHOST_SET_VRING_CALL
        ringtest: ring.c malloc & memset to calloc
        virtio_vop: don't kfree device on register failure
        virtio_pci: don't kfree device on register failure
        virtio: split device_register into device_initialize and device_add
        vhost: remove unused lock check flag in vhost_dev_cleanup()
        vhost: Remove the unused variable.
        virtio_blk: print capacity at probe time
        virtio: make VIRTIO a menuconfig to ease disabling it all
        virtio/ringtest: virtio_ring: fix up need_event math
        virtio/ringtest: fix up need_event math
        virtio: virtio_mmio: make of_device_ids const.
        firmware: Use PTR_ERR_OR_ZERO()
        virtio-mmio: Use PTR_ERR_OR_ZERO()
        vhost/scsi: Improve a size determination in four functions
        virtio_balloon: include disk/file caches memory statistics
      846ade7d
    • Linus Torvalds's avatar
      Merge tags 'cris-for-4.16' and 'cris-for-4.16-urgent' of... · 977e4152
      Linus Torvalds authored
      Merge tags 'cris-for-4.16' and 'cris-for-4.16-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris
      
      Pull CRIS updates and fixes from Jesper Nilsson:
      
       - a small fix for some conflicting symbols, aligning CRIS with other
         platforms.
      
       - fix build breakage regression for all CRIS SoCs. The main Makefile
         for the CRIS port was overzealously scrubbed in 4.15-rc3.
      
      * tag 'cris-for-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris:
        cris: Fix conflicting types for _etext, _edata, _end
      
      * tag 'cris-for-4.16-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris:
        CRIS: Restore mistakenly cleared kernel Makefile
      977e4152
    • Jesper Nilsson's avatar
      CRIS: Restore mistakenly cleared kernel Makefile · 6e037721
      Jesper Nilsson authored
      Commit 0fbc0b67 ("cris: remove arch specific early DT functions")
      was a bit overzealous in removing the CRIS DT handling,
      and the complete contents of the Makefile was erased
      instead of just the line for the devicetree file.
      
      This lead to a complete link failure for all SoCs in
      the CRIS port due to missing symbols.
      
      Restore the contents except the line for the devicetree file.
      Signed-off-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
      Fixes: 0fbc0b67
      6e037721
  2. 07 Feb, 2018 28 commits
    • Linus Torvalds's avatar
      Merge tag 'modules-for-v4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux · 581e400f
      Linus Torvalds authored
      Pull modules updates from Jessica Yu:
       "Minor code cleanups and MAINTAINERS update"
      
      * tag 'modules-for-v4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux:
        modpost: Remove trailing semicolon
        ftrace/module: Move ftrace_release_mod() to ddebug_cleanup label
        MAINTAINERS: Remove from module & paravirt maintenance
      581e400f
    • Linus Torvalds's avatar
      Merge tag 'iversion-v4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux · 6fbac201
      Linus Torvalds authored
      Pull inode->i_version cleanup from Jeff Layton:
       "Goffredo went ahead and sent a patch to rename this function, and
        reverse its sense, as we discussed last week.
      
        The patch is very straightforward and I figure it's probably best to
        go ahead and merge this to get the API as settled as possible"
      
      * tag 'iversion-v4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux:
        iversion: Rename make inode_cmp_iversion{+raw} to inode_eq_iversion{+raw}
      6fbac201
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · fe803f86
      Linus Torvalds authored
      Pull UDF and ext2 fixlets from Jan Kara:
       "A UDF fix and an ext2 cleanup"
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        ext2: drop unneeded newline
        udf: Sanitize nanoseconds for time stamps
      fe803f86
    • Dave Airlie's avatar
      Merge tag 'drm-intel-next-fixes-2018-02-07' of... · 94fc27ac
      Dave Airlie authored
      Merge tag 'drm-intel-next-fixes-2018-02-07' of git://anongit.freedesktop.org/drm/drm-intel into drm-next
      
      Fix for pcode timeouts on BXT and GLK, cmdparser fixes and fixes
      for new vbt version on CFL and CNL.
      
      GVT contains vGPU reset enhancement, which refines vGPU reset flow
      and the support of virtual aperture read/write when x-no-mmap=on
      is set in KVM, which is required by a test case from Redhat and
      also another fix for virtual OpRegion.
      
      * tag 'drm-intel-next-fixes-2018-02-07' of git://anongit.freedesktop.org/drm/drm-intel:
        drm/i915/bios: add DP max link rate to VBT child device struct
        drm/i915/cnp: Properly handle VBT ddc pin out of bounds.
        drm/i915/cnp: Ignore VBT request for know invalid DDC pin.
        drm/i915/cmdparser: Do not check past the cmd length.
        drm/i915/cmdparser: Check reg_table_count before derefencing.
        drm/i915/bxt, glk: Increase PCODE timeouts during CDCLK freq changing
        drm/i915/gvt: Use KVM r/w to access guest opregion
        drm/i915/gvt: Fix aperture read/write emulation when enable x-no-mmap=on
        drm/i915/gvt: only reset execlist state of one engine during VM engine reset
        drm/i915/gvt: refine intel_vgpu_submission_ops as per engine ops
      94fc27ac
    • Linus Torvalds's avatar
      Merge tag 'regulator-fix-v4.16-suspend' of... · ffefb181
      Linus Torvalds authored
      Merge tag 'regulator-fix-v4.16-suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
      
      Pull regulator fix from Mark Brown:
       "Fix suspend to idle.
      
        Testing on mainline after the initial regulator pull request went in
        identified a regression for suspend to idle due to it calling the
        suspend operations with states that it wasn't realized could happen,
        this patch fixes the problem"
      
      * tag 'regulator-fix-v4.16-suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
        regulator: Fix suspend to idle
      ffefb181
    • Linus Torvalds's avatar
      Merge tag 'fbdev-v4.16' of git://github.com/bzolnier/linux · c3611b6d
      Linus Torvalds authored
      Pull fbdev updates from Bartlomiej Zolnierkiewicz:
       "There is nothing really major here:
      
         - fix display-timings lookup in the Device Tree in atmel_lcdfb driver
           (Johan Hovold)
      
         - fix video mode and line_length to be set correctly in vfb driver
           (Pieter "PoroCYon" Sluys)
      
         - fix returning nonsensical values to the user-space on GIO_FONTX
           ioctl when using dummy console (Nicolas Pitre)
      
         - add missing license tag to mmpfb driver (Arnd Bergmann)
      
         - convert radeonfb and pxa3xx_gcu drivers to use ktime_get[_ts64]()
           instead of the deprecated do_gettimeofday() (Arnd Bergmann)
      
         - switch udlfb driver from using the pr_*() logging functions to the
           dev_*() ones + related cleanups (Ladislav Michl)
      
         - use __raw I/O accessors also on arm64 (Ji Zhang)
      
         - fix Kconfig help text for intelfb driver (Randy Dunlap)
      
         - do not duplicate features data in omapfb driver (Ladislav Michl)
      
         - misc cleanups (Colin Ian King, Markus Elfring, Rasmus Villemoes,
           Vasyl Gomonovych, Himanshu Jha, Michael Trimarchi)"
      
      * tag 'fbdev-v4.16' of git://github.com/bzolnier/linux: (25 commits)
        video: udlfb: Switch from the pr_*() to the dev_*() logging functions
        video: udlfb: Constify read only data
        video: fbdev/mmp: add MODULE_LICENSE
        console/dummy: leave .con_font_get set to NULL
        fbdev: mxsfb: use framebuffer_alloc in the correct way
        video: udlfb: Do not name private data 'dev'
        video: udlfb: Remove noisy warnings
        video: udlfb: Remove redundant gdev variable
        video: udlfb: Remove unnecessary local variable
        fbdev: auo_k190x: Use zeroing memory allocator instead of allocator/memset
        vfb: fix video mode and line_length being set when loaded
        fbdev: arm64 use __raw I/O memory api
        omapfb: dss: Do not duplicate features data
        video: fbdev: omap2: Use PTR_ERR_OR_ZERO()
        fbdev: au1200fb: delete duplicate header contents
        fbdev: pxa3xx: use ktime_get_ts64 for time stamps
        fbdev: radeon: use ktime_get() for HZ calibration
        video: smscufx: Improve a size determination in two functions
        video: udlfb: Delete an unnecessary return statement in two functions
        video: udlfb: Improve a size determination in dlfb_alloc_urb_list()
        ...
      c3611b6d
    • Linus Torvalds's avatar
      Merge tag 'platform-drivers-x86-v4.16-2' of git://git.infradead.org/linux-platform-drivers-x86 · cc006a22
      Linus Torvalds authored
      Pull more x86 platform-drivers updates from Andy Shevchenko:
       "The DEFINE_SHOW_ATTRIBUTE() macro was defined privately in three
        locations and is useful for new and old users to avoid a lot of code
        duplication.
      
        Move the macro to seq_file.h.
      
        Along with above, clean up three drivers to use that macro.
      
        This, due to dependencies, was sent separately since affected changes
        weren't upstream originally yet. The rationale of doing this now is to
        allow use of new macro in v4.17 cycle in a conflictless manner"
      
      * tag 'platform-drivers-x86-v4.16-2' of git://git.infradead.org/linux-platform-drivers-x86:
        platform/x86: samsung-laptop: Re-use DEFINE_SHOW_ATTRIBUTE() macro
        platform/x86: ideapad-laptop: Re-use DEFINE_SHOW_ATTRIBUTE() macro
        platform/x86: dell-laptop: Re-use DEFINE_SHOW_ATTRIBUTE() macro
        seq_file: Introduce DEFINE_SHOW_ATTRIBUTE() helper macro
      cc006a22
    • Jani Nikula's avatar
      drm/i915/bios: add DP max link rate to VBT child device struct · 6dd3104e
      Jani Nikula authored
      Update VBT defs to reflect revision 216. While at it, default the
      expected child device struct size to sizeof the size rather than a
      hardcoded value.
      
      v2: Fix bit order (David)
      
      Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
      Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20180118153310.32437-1-jani.nikula@intel.com
      (cherry picked from commit c4fb60b9)
      Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
      6dd3104e
    • Linus Torvalds's avatar
      Merge tag 'asoc-v4.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound · 7590e37b
      Linus Torvalds authored
      Pull more ASoC updates from Mark Brown:
       "With the merge window having been delayed for another week here's
        another batch of updates that came in during that week.
      
        There's a few important fixes in here, mainly a fix for I/O on a
        number of devices caused by some of the component rework and a fix for
        a potential issue if more than one component in a link provides
        compressed operations. The I/O fixes are particularly important as the
        problem causes a power regression on a number of OMAP platforms"
      
      * tag 'asoc-v4.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound: (22 commits)
        ASoC: stm32: add of dependency for stm32 drivers
        ASoC: mt8173-rt5650: fix child-node lookup
        ASoC: dapm: fix debugfs read using path->connected
        ASoC: compress: Fixup error messages
        ASoC: compress: Remove some extraneous blank lines
        ASoC: compress: Correct handling of copy callback
        ASoC: Intel: kbl: Enable mclk and ssp sclk early
        ASoC: Intel: Skylake: Add extended I2S config blob support in Clock driver
        ASoC: Intel: Skylake: Add ssp clock driver
        ASoC: Fix twl4030 and 6040 regression by adding back read and write
        ASoC: sun8i-codec: Add ADC support for a33
        ASoC: rockchip: Use dummy_dai for rt5514 dsp dailink
        ASoC: soc-pcm: rename .pmdown_time to .use_pmdown_time for Component
        ASoC: ak4613: call dummy write for PW_MGMT1/3 when Playback
        ASoC: soc-pcm: don't call flush_delayed_work() many times in soc_pcm_private_free()
        ASoC: soc-core: snd_soc_rtdcom_lookup() cares component driver name
        ASoC: sam9x5_wm8731: Drop 'ASoC' prefix from error messages
        ASoC: sam9g20_wm8731: use dev_*() logging functions
        ASoC: max98373 Changed SPDX header in C++ comments style
        ASoC: dmic: Fix check of return value from read of 'num-channels'
        ...
      7590e37b
    • Dave Airlie's avatar
      Merge branch 'drm-next-4.16' of git://people.freedesktop.org/~agd5f/linux into drm-next · 2dd27794
      Dave Airlie authored
      A few more misc fixes for 4.16.
      
      * 'drm-next-4.16' of git://people.freedesktop.org/~agd5f/linux:
        drm/amdgpu: re-enable CGCG on CZ and disable on ST
        drm/amdgpu: disable coarse grain clockgating for ST
        drm/radeon: adjust tested variable
        drm/amdgpu: remove WARN_ON when VM isn't found v2
        drm/amdgpu: fix locking in vega10_ih_prescreen_iv
        drm/amdgpu: fix another potential cause of VM faults
        drm/amdgpu: use queue 0 for kiq ring
        drm/ttm: Fix 'buf' pointer update in ttm_bo_vm_access_kmap() (v2)
        drm/ttm: fix missing parameter change for ttm_bo_cleanup_refs
      2dd27794
    • Linus Torvalds's avatar
      Merge tag 'linux-watchdog-4.16-rc1' of git://www.linux-watchdog.org/linux-watchdog · 7e6127c1
      Linus Torvalds authored
      Pull watchdog updates from Wim Van Sebroeck:
      
       - new watchdog device drivers for Realtek RTD1295 and Spreadtrum SC9860
         platform
      
       - add support for the following devices: jz4780 SoC, AST25xx series SoC
         and r8a77970 SoC
      
       - convert to watchdog framework: i6300esb_wdt, xen_wdt and sp5100_tco
      
       - several fixes for watchdog core
      
       - remove at32ap700x and obsolete documentation
      
       - gpio: Convert to use GPIO descriptors
      
       - rename gemini into FTWDT010 as this IP block is generc from Faraday
         Technology
      
       - various clean-ups and small bugfixes
      
       - add Guenter Roeck as co-maintainer
      
       - change maintainers e-mail address
      
      * tag 'linux-watchdog-4.16-rc1' of git://www.linux-watchdog.org/linux-watchdog: (74 commits)
        documentation: watchdog: remove documentation of w83697hf_wdt/w83697ug_wdt
        documentation: watchdog: remove documentation for ixp2000
        documentation: watchdog: remove documentation of at32ap700x_wdt
        watchdog: remove at32ap700x_wdt
        watchdog: sp5100_tco: Add support for recent FCH versions
        watchdog: sp5100-tco: Abort if watchdog is disabled by hardware
        watchdog: sp5100_tco: Use bit operations
        watchdog: sp5100_tco: Convert to use watchdog subsystem
        watchdog: sp5100_tco: Clean up function and variable names
        watchdog: sp5100_tco: Use dev_ print functions where possible
        watchdog: sp5100_tco: Match PCI device early
        watchdog: sp5100_tco: Clean up sp5100_tco_setupdevice
        watchdog: sp5100_tco: Use standard error codes
        watchdog: sp5100_tco: Use request_muxed_region where possible
        watchdog: sp5100_tco: Fix watchdog disable bit
        watchdog: sp5100_tco: Always use SP5100_IO_PM_{INDEX_REG,DATA_REG}
        watchdog: core: make sure the watchdog_worker is not deferred
        watchdog: mt7621: switch to using managed devm_watchdog_register_device()
        watchdog: mt7621: set WDOG_HW_RUNNING bit when appropriate
        watchdog: imx2_wdt: restore previous timeout after suspend+resume
        ...
      7e6127c1
    • Linus Torvalds's avatar
      Merge tag 'riscv-for-linus-4.16-merge_window' of... · 413879a1
      Linus Torvalds authored
      Merge tag 'riscv-for-linus-4.16-merge_window' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux
      
      Pull RISC-V updates from Palmer Dabbelt:
       "This contains the fixes we'd like to target for the 4.16 merge window.
        It's not as much as I was originally hoping to do but between glibc,
        the chip, and FOSDEM there just wasn't enough time to get everything
        put together. As such, this merge window is essentially just going to
        be small changes. This includes mostly cleanups:
      
         - A build fix failure to the audit test cases.
      
           RISC-V doesn't have renameat because the generic syscall ABI moved
           to renameat2 by the time of our port. The syscall audit test cases
           don't understand this, so I added a trivial fix. This went through
           mailing list review during the 4.15 merge window, but nobody has
           picked it up so I think it's best to just do this here.
      
         - The removal of our command-line argument processing code. The
           "mem_end" stuff was broken and the rest duplicated generic device
           tree code. The generic code was already being called.
      
         - Some unused/redundant code has been removed, including
           __ARCH_HAVE_MMU, current_pgdir, and the initialization of
           init_mm.pgd.
      
         - SUM is disabled upon taking a trap, which means that user memory is
           protected during traps taking inside copy_{to,from}_user().
      
         - The sptbr CSR has been renamed to satp in C code. We haven't
           changed the assembly code in order to maintain compatibility with
           binutils 2.29, which doesn't understand the new name.
      
        Additionally, we're adding some new features:
      
         - Basic ftrace support, thanks to Alan Kao!
      
         - Support for ZONE_DMA32.
      
           This is necessary for all the normal reasons, but also to deal with
           a deficiency in the Xilinx PCIe controller we're using on our
           FPGA-based systems. While the ZONE_DMA32 addition should be
           sufficient for most uses, it doesn't complete the fix for the
           Xilinx controller.
      
         - TLB shootdowns now only target the harts where they're necessary,
           instead of applying to all harts in the system.
      
        These patches have all been sitting on our linux-next branch for a
        while now. Due to time constraints this is all I feel comfortable
        submitting during the 4.16 merge window, hopefully we'll do better
        next time!"
      
      [ Note to self: "harts" is RISC-V speak for "hardware threads".  I had
        to look that up.    - Linus ]
      
      * tag 'riscv-for-linus-4.16-merge_window' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux:
        riscv: inline set_pgdir into its only caller
        riscv: rename sptbr to satp
        riscv: don't read back satp in paging_init
        riscv: remove the unused current_pgdir function
        riscv: add ZONE_DMA32
        RISC-V: Limit the scope of TLB shootdowns
        riscv: disable SUM in the exception handler
        riscv: remove redundant unlikely()
        riscv: remove unused __ARCH_HAVE_MMU define
        riscv/ftrace: Add basic support
        RISC-V: Remove mem_end command line processing
        RISC-V: Remove duplicate command-line parsing logic
        audit: Avoid build failures on systems without renameat
      413879a1
    • Linus Torvalds's avatar
      Merge tag 'mips_fixes_4.16_1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips · 0bd2afc7
      Linus Torvalds authored
      Pull MIPS fixes from James Hogan:
       "A couple of MIPS fixes for 4.16-rc1, including an important regression
        in 4.15 and a rather more longstanding corner case build fix.
      
        These are separate from the main pull request as one of the bugs fixed
        was only recently introduced in v4.15-rc8.
      
         - Fix CPS regression on older binutils due to MIPS_ISA_LEVEL_RAW fix
           (4.15)
      
         - Fix allmodconfig + CONFIG_MACH_TX49XX=y builds due to incorrect use
           of IS_ENABLED() (2.6.28)"
      
      * tag 'mips_fixes_4.16_1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips:
        MIPS: TXx9: use IS_BUILTIN() for CONFIG_LEDS_CLASS
        MIPS: CPS: Fix MIPS_ISA_LEVEL_RAW fallout
      0bd2afc7
    • Linus Torvalds's avatar
      Merge tag 'mips_4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips · 85789536
      Linus Torvalds authored
      Pull MIPS updates from James Hogan:
       "These are the main MIPS changes for 4.16.
      
        Rough overview:
      
         (1) Basic support for the Ingenic JZ4770 based GCW Zero open-source
             handheld video game console
      
         (2) Support for the Ranchu board (used by Android emulator)
      
         (3) Various cleanups and misc improvements
      
        More detailed summary:
      
        Fixes:
         - Fix generic platform's USB_*HCI_BIG_ENDIAN selects (4.9)
         - Fix vmlinuz default build when ZBOOT selected
         - Fix clean up of vmlinuz targets
         - Fix command line duplication (in preparation for Ingenic JZ4770)
      
        Miscellaneous:
         - Allow Processor ID reads to be to be optimised away by the compiler
           (improves performance when running in guest)
         - Push ARCH_MIGHT_HAVE_PC_SERIO/PARPORT down to platform level to
           disable on generic platform with Ranchu board support
         - Add helpers for assembler macro instructions for older assemblers
         - Use assembler macro instructions to support VZ, XPA & MSA
           operations on older assemblers, removing C wrapper duplication
         - Various improvements to VZ & XPA assembly wrappers
         - Add drivers/platform/mips/ to MIPS MAINTAINERS entry
      
        Minor cleanups:
         - Misc FPU emulation cleanups (removal of unnecessary include, moving
           macros to common header, checkpatch and sparse fixes)
         - Remove duplicate assignment of core in play_dead()
         - Remove duplication in watchpoint handling
         - Remove mips_dma_mapping_error() stub
         - Use NULL instead of 0 in prepare_ftrace_return()
         - Use proper kernel-doc Return keyword for
           __compute_return_epc_for_insn()
         - Remove duplicate semicolon in csum_fold()
      
        Platform support:
      
        Broadcom:
         - Enable ZBOOT on BCM47xx
      
        Generic platform:
         - Add Ranchu board support, used by Android emulator
         - Fix machine compatible string matching for Ranchu
         - Support GIC in EIC mode
      
        Ingenic platforms:
         - Add DT, defconfig and other support for JZ4770 SoC and GCW Zero
         - Support dynamnic machine types (i.e. JZ4740 / JZ4770 / JZ4780)
         - Add Ingenic JZ4770 CGU clocks
         - General Ingenic clk changes to prepare for JZ4770 SoC support
         - Use common command line handling code
         - Add DT vendor prefix to GCW (Game Consoles Worldwide)
      
        Loongson:
         - Add MAINTAINERS entry for Loongson2 and Loongson3 platforms
         - Drop 32-bit support for Loongson 2E/2F devices
         - Fix build failures due to multiple use of 'MEM_RESERVED'"
      
      * tag 'mips_4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips: (53 commits)
        MIPS: Malta: Sanitize mouse and keyboard configuration.
        MIPS: Update defconfigs after previous patch.
        MIPS: Push ARCH_MIGHT_HAVE_PC_SERIO down to platform level
        MIPS: Push ARCH_MIGHT_HAVE_PC_PARPORT down to platform level
        MIPS: SMP-CPS: Remove duplicate assignment of core in play_dead
        MIPS: Generic: Support GIC in EIC mode
        MIPS: generic: Fix Makefile alignment
        MIPS: generic: Fix ranchu_of_match[] termination
        MIPS: generic: Fix machine compatible matching
        MIPS: Loongson fix name confict - MEM_RESERVED
        MIPS: bcm47xx: enable ZBOOT support
        MIPS: Fix trailing semicolon
        MIPS: Watch: Avoid duplication of bits in mips_read_watch_registers
        MIPS: Watch: Avoid duplication of bits in mips_install_watch_registers.
        MIPS: MSA: Update helpers to use new asm macros
        MIPS: XPA: Standardise readx/writex accessors
        MIPS: XPA: Allow use of $0 (zero) to MTHC0
        MIPS: XPA: Use XPA instructions in assembly
        MIPS: VZ: Pass GC0 register names in $n format
        MIPS: VZ: Update helpers to use new asm macros
        ...
      85789536
    • Linus Torvalds's avatar
      Merge tag 'docs-4.16-2' of git://git.lwn.net/linux · e03ab6c4
      Linus Torvalds authored
      Pull more documentation updates from Jonathan Corbet:
       "A few late-arriving fixes, along with Konstantin's PGP document that
        had no reason to wait another cycle"
      
      * tag 'docs-4.16-2' of git://git.lwn.net/linux:
        Documentation/process: tweak pgp maintainer guide
        Documentation/admin-guide: fixes for thunderbolt.rst
        Documentation: mips: Update AU1xxx_IDE Kconfig dependencies
        Fix broken link in Documentation/process/kernel-docs.rst
        Documentation/process: kernel maintainer PGP guide
      e03ab6c4
    • Mark Brown's avatar
      Merge remote-tracking branches 'asoc/topic/sam9x5_wm8731',... · 3d0a352a
      Mark Brown authored
      Merge remote-tracking branches 'asoc/topic/sam9x5_wm8731', 'asoc/topic/sgtl5000' and 'asoc/topic/sun8i-codec' into asoc-next
      3d0a352a
    • Mark Brown's avatar
      Merge remote-tracking branches 'asoc/topic/max98373', 'asoc/topic/mtk',... · 17124877
      Mark Brown authored
      Merge remote-tracking branches 'asoc/topic/max98373', 'asoc/topic/mtk', 'asoc/topic/pcm', 'asoc/topic/rockchip' and 'asoc/topic/sam9g20_wm8731' into asoc-next
      17124877
    • Mark Brown's avatar
      Merge remote-tracking branches 'asoc/topic/ak4613', 'asoc/topic/core',... · 535b218a
      Mark Brown authored
      Merge remote-tracking branches 'asoc/topic/ak4613', 'asoc/topic/core', 'asoc/topic/dmic' and 'asoc/topic/intel' into asoc-next
      535b218a
    • Mark Brown's avatar
    • Mark Brown's avatar
    • Mark Brown's avatar
      Merge remote-tracking branches 'asoc/fix/compress', 'asoc/fix/core',... · ce8ee02d
      Mark Brown authored
      Merge remote-tracking branches 'asoc/fix/compress', 'asoc/fix/core', 'asoc/fix/dapm', 'asoc/fix/mtk' and 'asoc/fix/stm' into asoc-next
      ce8ee02d
    • Olivier Moysan's avatar
      ASoC: stm32: add of dependency for stm32 drivers · 276d70f7
      Olivier Moysan authored
      Add of dependency for STM32 ASoC drivers.
      DFSDM of dependency is already inherited
      from STM32_DFSDM_ADC dependency.
      Signed-off-by: default avatarolivier moysan <olivier.moysan@st.com>
      Signed-off-by: default avatarMark Brown <broonie@kernel.org>
      276d70f7
    • Johan Hovold's avatar
      ASoC: mt8173-rt5650: fix child-node lookup · 3a0a7b26
      Johan Hovold authored
      This driver used the wrong OF-helper when looking up the optional
      capture-codec child node during probe. Instead of searching just
      children of the sound node, a tree-wide depth-first search starting at
      the unrelated platform node was done. Not only could this end up
      matching an unrelated node or no node at all; the platform node could
      also be prematurely freed since of_find_node_by_name() drops a reference
      to its first argument. This particular pattern has been observed leading
      to crashes after probe deferrals in other drivers.
      
      Fix this by dropping the broken call to of_find_node_by_name() and
      keeping only the second, correct lookup using of_get_child_by_name()
      while taking care not to bail out if the optional node is missing.
      
      Note that this also addresses two capture-codec node-reference leaks
      (one for each of the original helper calls).
      
      Compile tested only.
      
      Fixes: d349caeb ("ASoC: mediatek: Add second I2S on mt8173-rt5650 machine driver")
      Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
      Signed-off-by: default avatarMark Brown <broonie@kernel.org>
      3a0a7b26
    • KaiChieh Chuang's avatar
      ASoC: dapm: fix debugfs read using path->connected · 28735af3
      KaiChieh Chuang authored
      This fix a bug in dapm_widget_power_read_file(),
      where it may sent opposite order of source/sink widget
      into the p->connected().
      
      for example,
      static int connected_check(source, sink);
      {"w_sink", NULL, "w_source", connected_check}
      
      the dapm_widget_power_read_file() will query p->connected()
      in following case
      	p->conneted("w_source", "w_sink")
      	p->conneted("w_sink", "w_source")
      we should avoid the last case, since it's the wrong order (source/sink)
      as declared in snd_soc_dapm_route.
      Signed-off-by: default avatarKaiChieh Chuang <kaichieh.chuang@mediatek.com>
      Signed-off-by: default avatarMark Brown <broonie@kernel.org>
      28735af3
    • Andy Shevchenko's avatar
      platform/x86: samsung-laptop: Re-use DEFINE_SHOW_ATTRIBUTE() macro · 9a7c551b
      Andy Shevchenko authored
      ...instead of open coding file operations followed by custom ->open()
      callbacks per each attribute.
      Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
      9a7c551b
    • Andy Shevchenko's avatar
      platform/x86: ideapad-laptop: Re-use DEFINE_SHOW_ATTRIBUTE() macro · 334c4efd
      Andy Shevchenko authored
      ...instead of open coding file operations followed by custom ->open()
      callbacks per each attribute.
      Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
      334c4efd
    • Andy Shevchenko's avatar
      platform/x86: dell-laptop: Re-use DEFINE_SHOW_ATTRIBUTE() macro · b04eb8aa
      Andy Shevchenko authored
      ...instead of open coding file operations followed by custom ->open()
      callbacks per each attribute.
      Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
      b04eb8aa
    • Andy Shevchenko's avatar
      seq_file: Introduce DEFINE_SHOW_ATTRIBUTE() helper macro · a08f06bb
      Andy Shevchenko authored
      The DEFINE_SHOW_ATTRIBUTE() helper macro would be useful for current
      users, which are many of them, and for new comers to decrease code
      duplication.
      Acked-by: default avatarLee Jones <lee.jones@linaro.org>
      Acked-by: default avatarDarren Hart (VMware) <dvhart@infradead.org>
      Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
      a08f06bb