1. 24 Feb, 2017 21 commits
    • Tina Ruchandani's avatar
      afs: Prevent callback expiry timer overflow · aff9a299
      Tina Ruchandani authored
      get_seconds() returns real wall-clock seconds. On 32-bit systems
      this value will overflow in year 2038 and beyond. This patch changes
      afs_vnode record to use ktime_get_real_seconds() instead, for the
      fields cb_expires and cb_expires_at.
      Signed-off-by: default avatarTina Ruchandani <ruchandani.tina@gmail.com>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      aff9a299
    • Tina Ruchandani's avatar
      afs: Migrate vlocation fields to 64-bit · 6377a13e
      Tina Ruchandani authored
      get_seconds() returns real wall-clock seconds. On 32-bit systems
      this value will overflow in year 2038 and beyond. This patch changes
      afs's vlocation record to use ktime_get_real_seconds() instead, for the
      fields time_of_death and update_at.
      Signed-off-by: default avatarTina Ruchandani <ruchandani.tina@gmail.com>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      6377a13e
    • Andreea-Cristina Bernat's avatar
      afs: security: Replace rcu_assign_pointer() with RCU_INIT_POINTER() · 4a396d81
      Andreea-Cristina Bernat authored
      The use of "rcu_assign_pointer()" is NULLing out the pointer.
      According to RCU_INIT_POINTER()'s block comment:
      "1.   This use of RCU_INIT_POINTER() is NULLing out the pointer"
      it is better to use it instead of rcu_assign_pointer() because it has a
      smaller overhead.
      
      The following Coccinelle semantic patch was used:
      @@
      @@
      
      - rcu_assign_pointer
      + RCU_INIT_POINTER
        (..., NULL)
      Signed-off-by: default avatarAndreea-Cristina Bernat <bernat.ada@gmail.com>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      4a396d81
    • Andreea-Cristina Bernat's avatar
      afs: inode: Replace rcu_assign_pointer() with RCU_INIT_POINTER() · dcce15b7
      Andreea-Cristina Bernat authored
      The use of "rcu_assign_pointer()" is NULLing out the pointer.
      According to RCU_INIT_POINTER()'s block comment:
      "1.   This use of RCU_INIT_POINTER() is NULLing out the pointer"
      it is better to use it instead of rcu_assign_pointer() because it has a
      smaller overhead.
      
      The following Coccinelle semantic patch was used:
      @@
      @@
      
      - rcu_assign_pointer
      + RCU_INIT_POINTER
        (..., NULL)
      Signed-off-by: default avatarAndreea-Cristina Bernat <bernat.ada@gmail.com>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      dcce15b7
    • David Howells's avatar
      afs: Distinguish mountpoints from symlinks by file mode alone · bf68900c
      David Howells authored
      In AFS, mountpoints appear as symlinks with mode 0644 and normal symlinks
      have mode 0777, so use this to distinguish them rather than reading the
      content and parsing it.  In the case of a mountpoint, the symlink body is a
      formatted string indicating the location of the target volume.
      
      Note that with this, kAFS no longer 'pre-fetches' the contents of symlinks,
      so afs_readpage() may fail with an access-denial because when the VFS calls
      d_automount(), it wraps the call in an credentials override that sets the
      initial creds - thereby preventing access to the caller's keyrings and the
      authentication keys held therein.
      
      To this end, a patch reverting that change to the VFS is required also.
      Reported-by: default avatarJeffrey Altman <jaltman@auristor.com>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      bf68900c
    • David Howells's avatar
      afs: Flush outstanding writes when an fd is closed · d4b4516c
      David Howells authored
      Flush outstanding writes in afs when an fd is closed.  This is what NFS and
      CIFS do.
      Reported-by: default avatarMarc Dionne <marc.c.dionne@gmail.com>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      d4b4516c
    • David Howells's avatar
      afs: Handle a short write to an AFS page · 9ece94db
      David Howells authored
      Handle the situation where afs_write_begin() is told to expect that a
      full-page write will be made, but this doesn't happen (EFAULT, CTRL-C,
      etc.), and so afs_write_end() sees a partial write took place.  Currently,
      no attempt is to deal with the discrepency.
      
      Fix this by loading the gap from the server.
      Reported-by: default avatarAl Viro <viro@ZenIV.linux.org.uk>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      9ece94db
    • David Howells's avatar
      afs: Kill struct afs_read::pg_offset · 8f976ca1
      David Howells authored
      Kill struct afs_read::pg_offset as nothing uses it.  It's unnecessary as pos
      can be masked off.
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      8f976ca1
    • David Howells's avatar
      afs: Handle better the server returning excess or short data · bd127e84
      David Howells authored
      When an AFS server is given an FS.FetchData{,64} request to read data from
      a file, it is permitted by the protocol to return more or less than was
      requested.  kafs currently relies on the latter behaviour in readpage{,s}
      to handle a partial page at the end of the file (we just ask for a whole
      page and clear space beyond the short read).
      
      However, we don't handle all cases.  Add:
      
       (1) Handle excess data by discarding it rather than aborting.  Note that
           we use a common static buffer to discard into so that the decryption
           algorithm advances the PCBC state.
      
       (2) Handle a short read that affects more than just the last page.
      
      Note that if a read comes up unexpectedly short of long, it's possible that
      the server's copy of the file changed - in which case the data version
      number will have been incremented and the callback will have been broken -
      in which case all the pages currently attached to the inode will be zapped
      anyway at some point.
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      bd127e84
    • Marc Dionne's avatar
      afs: Deal with an empty callback array · 97567a23
      Marc Dionne authored
      Servers may send a callback array that is the same size as
      the FID array, or an empty array.  If the callback count is
      0, the code would attempt to read (fid_count * 12) bytes of
      data, which would fail and result in an unmarshalling error.
      This would lead to stale data for remotely modified files
      or directories.
      
      Store the callback array size in the internal afs_call
      structure and use that to determine the amount of data to
      read.
      Signed-off-by: default avatarMarc Dionne <marc.dionne@auristor.com>
      97567a23
    • Marc Dionne's avatar
      afs: Adjust mode bits processing · 4336ae58
      Marc Dionne authored
      Mode bits for an afs file should not be enforced in the usual
      way.
      
      For files, the absence of user bits can restrict file access
      with respect to what is granted by the server.
      
      These bits apply regardless of the owner or the current uid; the
      rest of the mode bits (group, other) are ignored.
      Signed-off-by: default avatarMarc Dionne <marc.dionne@auristor.com>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      4336ae58
    • Marc Dionne's avatar
      afs: Populate group ID from vnode status · d97ce7ac
      Marc Dionne authored
      The group was hard coded to GLOBAL_ROOT_GID; use the group
      ID that was received from the server.
      Signed-off-by: default avatarMarc Dionne <marc.dionne@auristor.com>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      d97ce7ac
    • David Howells's avatar
      afs: Fix page overput in afs_fill_page() · b667883b
      David Howells authored
      afs_fill_page() loads the page it wants to fill into the afs_read request
      without incrementing its refcount - but then calls afs_put_read() to clean
      up afterwards, which then releases a ref on the page.
      
      Fix this by getting a ref on the page before calling
      afs_vnode_fetch_data().
      
      This causes sync after a write to hang in afs_writepages_region() because
      find_get_pages_tag() gets confused and doesn't return.
      
      Fixes: 196ee9cd ("afs: Make afs_fs_fetch_data() take a list of pages")
      Reported-by: default avatarMarc Dionne <marc.dionne@auristor.com>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Tested-by: default avatarMarc Dionne <marc.dionne@auristor.com>
      b667883b
    • David Howells's avatar
      afs: Fix missing put_page() · ccc51070
      David Howells authored
      In afs_writepages_region(), inside the loop where we find dirty pages to
      deal with, one of the if-statements is missing a put_page().
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      ccc51070
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace · f1ef09fd
      Linus Torvalds authored
      Pull namespace updates from Eric Biederman:
       "There is a lot here. A lot of these changes result in subtle user
        visible differences in kernel behavior. I don't expect anything will
        care but I will revert/fix things immediately if any regressions show
        up.
      
        From Seth Forshee there is a continuation of the work to make the vfs
        ready for unpriviled mounts. We had thought the previous changes
        prevented the creation of files outside of s_user_ns of a filesystem,
        but it turns we missed the O_CREAT path. Ooops.
      
        Pavel Tikhomirov and Oleg Nesterov worked together to fix a long
        standing bug in the implemenation of PR_SET_CHILD_SUBREAPER where only
        children that are forked after the prctl are considered and not
        children forked before the prctl. The only known user of this prctl
        systemd forks all children after the prctl. So no userspace
        regressions will occur. Holding earlier forked children to the same
        rules as later forked children creates a semantic that is sane enough
        to allow checkpoing of processes that use this feature.
      
        There is a long delayed change by Nikolay Borisov to limit inotify
        instances inside a user namespace.
      
        Michael Kerrisk extends the API for files used to maniuplate
        namespaces with two new trivial ioctls to allow discovery of the
        hierachy and properties of namespaces.
      
        Konstantin Khlebnikov with the help of Al Viro adds code that when a
        network namespace exits purges it's sysctl entries from the dcache. As
        in some circumstances this could use a lot of memory.
      
        Vivek Goyal fixed a bug with stacked filesystems where the permissions
        on the wrong inode were being checked.
      
        I continue previous work on ptracing across exec. Allowing a file to
        be setuid across exec while being ptraced if the tracer has enough
        credentials in the user namespace, and if the process has CAP_SETUID
        in it's own namespace. Proc files for setuid or otherwise undumpable
        executables are now owned by the root in the user namespace of their
        mm. Allowing debugging of setuid applications in containers to work
        better.
      
        A bug I introduced with permission checking and automount is now
        fixed. The big change is to mark the mounts that the kernel initiates
        as a result of an automount. This allows the permission checks in sget
        to be safely suppressed for this kind of mount. As the permission
        check happened when the original filesystem was mounted.
      
        Finally a special case in the mount namespace is removed preventing
        unbounded chains in the mount hash table, and making the semantics
        simpler which benefits CRIU.
      
        The vfs fix along with related work in ima and evm I believe makes us
        ready to finish developing and merge fully unprivileged mounts of the
        fuse filesystem. The cleanups of the mount namespace makes discussing
        how to fix the worst case complexity of umount. The stacked filesystem
        fixes pave the way for adding multiple mappings for the filesystem
        uids so that efficient and safer containers can be implemented"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
        proc/sysctl: Don't grab i_lock under sysctl_lock.
        vfs: Use upper filesystem inode in bprm_fill_uid()
        proc/sysctl: prune stale dentries during unregistering
        mnt: Tuck mounts under others instead of creating shadow/side mounts.
        prctl: propagate has_child_subreaper flag to every descendant
        introduce the walk_process_tree() helper
        nsfs: Add an ioctl() to return owner UID of a userns
        fs: Better permission checking for submounts
        exit: fix the setns() && PR_SET_CHILD_SUBREAPER interaction
        vfs: open() with O_CREAT should not create inodes with unknown ids
        nsfs: Add an ioctl() to return the namespace type
        proc: Better ownership of files for non-dumpable tasks in user namespaces
        exec: Remove LSM_UNSAFE_PTRACE_CAP
        exec: Test the ptracer's saved cred to see if the tracee can gain caps
        exec: Don't reset euid and egid when the tracee has CAP_SETUID
        inotify: Convert to using per-namespace limits
      f1ef09fd
    • Linus Torvalds's avatar
      Merge tag 'drm-for-v4.11-less-shouty' of git://people.freedesktop.org/~airlied/linux · ef96152e
      Linus Torvalds authored
      Pull drm updates from Dave Airlie:
       "This is the main drm pull request for v4.11.
      
        Nothing too major, the tinydrm and mmu-less support should make
        writing smaller drivers easier for some of the simpler platforms, and
        there are a bunch of documentation updates.
      
        Intel grew displayport MST audio support which is hopefully useful to
        people, and FBC is on by default for GEN9+ (so people know where to
        look for regressions). AMDGPU has a lot of fixes that would like new
        firmware files installed for some GPUs.
      
        Other than that it's pretty scattered all over.
      
        I may have a follow up pull request as I know BenH has a bunch of AST
        rework and fixes and I'd like to get those in once they've been tested
        by AST, and I've got at least one pull request I'm just trying to get
        the author to fix up.
      
        Core:
         - drm_mm reworked
         - Connector list locking and iterators
         - Documentation updates
         - Format handling rework
         - MMU-less support for fbdev helpers
         - drm_crtc_from_index helper
         - Core CRC API
         - Remove drm_framebuffer_unregister_private
         - Debugfs cleanup
         - EDID/Infoframe fixes
         - Release callback
         - Tinydrm support (smaller drivers for simple hw)
      
        panel:
         - Add support for some new simple panels
      
        i915:
         - FBC by default for gen9+
         - Shared dpll cleanups and docs
         - GEN8 powerdomain cleanup
         - DMC support on GLK
         - DP MST audio support
         - HuC loading support
         - GVT init ordering fixes
         - GVT IOMMU workaround fix
      
        amdgpu/radeon:
         - Power/clockgating improvements
         - Preliminary SR-IOV support
         - TTM buffer priority and eviction fixes
         - SI DPM quirks removed due to firmware fixes
         - Powerplay improvements
         - VCE/UVD powergating fixes
         - Cleanup SI GFX code to match CI/VI
         - Support for > 2 displays on 3/5 crtc asics
         - SI headless fixes
      
        nouveau:
         - Rework securre boot code in prep for GP10x secure boot
         - Channel recovery improvements
         - Initial power budget code
         - MMU rework preperation
      
        vmwgfx:
         - Bunch of fixes and cleanups
      
        exynos:
         - Runtime PM support for MIC driver
         - Cleanups to use atomic helpers
         - UHD Support for TM2/TM2E boards
         - Trigger mode fix for Rinato board
      
        etnaviv:
         - Shader performance fix
         - Command stream validator fixes
         - Command buffer suballocator
      
        rockchip:
         - CDN DisplayPort support
         - IOMMU support for arm64 platform
      
        imx-drm:
         - Fix i.MX5 TV encoder probing
         - Remove lower fb size limits
      
        msm:
         - Support for HW cursor on MDP5 devices
         - DSI encoder cleanup
         - GPU DT bindings cleanup
      
        sti:
         - stih410 cleanups
         - Create fbdev at binding
         - HQVDP fixes
         - Remove stih416 chip functionality
         - DVI/HDMI mode selection fixes
         - FPS statistic reporting
      
        omapdrm:
         - IRQ code cleanup
      
        dwi-hdmi bridge:
         - Cleanups and fixes
      
        adv-bridge:
         - Updates for nexus
      
        sii8520 bridge:
         - Add interlace mode support
         - Rework HDMI and lots of fixes
      
        qxl:
         - probing/teardown cleanups
      
        ZTE drm:
         - HDMI audio via SPDIF interface
         - Video Layer overlay plane support
         - Add TV encoder output device
      
        atmel-hlcdc:
         - Rework fbdev creation logic
      
        tegra:
         - OF node fix
      
        fsl-dcu:
         - Minor fixes
      
        mali-dp:
         - Assorted fixes
      
        sunxi:
         - Minor fix"
      
      [ This was the "fixed" pull, that still had build warnings due to people
        not even having build tested the result. I'm not a happy camper
      
        I've fixed the things I noticed up in this merge.      - Linus ]
      
      * tag 'drm-for-v4.11-less-shouty' of git://people.freedesktop.org/~airlied/linux: (1177 commits)
        lib/Kconfig: make PRIME_NUMBERS not user selectable
        drm/tinydrm: helpers: Properly fix backlight dependency
        drm/tinydrm: mipi-dbi: Fix field width specifier warning
        drm/tinydrm: mipi-dbi: Silence: ‘cmd’ may be used uninitialized
        drm/sti: fix build warnings in sti_drv.c and sti_vtg.c files
        drm/amd/powerplay: fix PSI feature on Polars12
        drm/amdgpu: refuse to reserve io mem for split VRAM buffers
        drm/ttm: fix use-after-free races in vm fault handling
        drm/tinydrm: Add support for Multi-Inno MI0283QT display
        dt-bindings: Add Multi-Inno MI0283QT binding
        dt-bindings: display/panel: Add common rotation property
        of: Add vendor prefix for Multi-Inno
        drm/tinydrm: Add MIPI DBI support
        drm/tinydrm: Add helper functions
        drm: Add DRM support for tiny LCD displays
        drm/amd/amdgpu: post card if there is real hw resetting performed
        drm/nouveau/tmr: provide backtrace when a timeout is hit
        drm/nouveau/pci/g92: Fix rearm
        drm/nouveau/drm/therm/fan: add a fallback if no fan control is specified in the vbios
        drm/nouveau/hwmon: expose power_max and power_crit
        ..
      ef96152e
    • Dave Airlie's avatar
      lib/Kconfig: make PRIME_NUMBERS not user selectable. · 64a57719
      Dave Airlie authored
      Linus doesn't like it user selectable, so kill it until
      someone needs it for something else.
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      64a57719
    • Noralf Trønnes's avatar
      drm/tinydrm: helpers: Properly fix backlight dependency · 7fef80a4
      Noralf Trønnes authored
      BACKLIGHT_CLASS_DEVICE was selected in the last version of the
      tinydrm patchset to fix the backlight dependency, but the
      ifdef CONFIG_BACKLIGHT_CLASS_DEVICE was forgotten. Fix that.
      Signed-off-by: default avatarNoralf Trønnes <noralf@tronnes.org>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      7fef80a4
    • Noralf Trønnes's avatar
      drm/tinydrm: mipi-dbi: Fix field width specifier warning · ce8c0137
      Noralf Trønnes authored
      This warning is seen on 64-bit builds in functions:
         'mipi_dbi_typec1_command':
         'mipi_dbi_typec3_command_read':
         'mipi_dbi_typec3_command':
      
      >> drivers/gpu/drm/tinydrm/mipi-dbi.c:65:20: warning: field width specifier '*' expects argument of type 'int', but argument 5 has type 'size_t {aka long unsigned int}' [-Wformat=]
            DRM_DEBUG_DRIVER("cmd=%02x, par=%*ph\n", cmd, len, data); \
                             ^
         include/drm/drmP.h:228:40: note: in definition of macro 'DRM_DEBUG_DRIVER'
           drm_printk(KERN_DEBUG, DRM_UT_DRIVER, fmt, ##__VA_ARGS__)
                                                 ^~~
      >> drivers/gpu/drm/tinydrm/mipi-dbi.c:671:2: note: in expansion of macro 'MIPI_DBI_DEBUG_COMMAND'
           MIPI_DBI_DEBUG_COMMAND(cmd, parameters, num);
           ^~~~~~~~~~~~~~~~~~~~~~
      
      Fix by casting 'len' to int in the macro MIPI_DBI_DEBUG_COMMAND().
      There is no chance of overflow.
      Signed-off-by: default avatarNoralf Trønnes <noralf@tronnes.org>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      ce8c0137
    • Noralf Trønnes's avatar
      drm/tinydrm: mipi-dbi: Silence: ‘cmd’ may be used uninitialized · b401f343
      Noralf Trønnes authored
      Fix this warning:
      drivers/gpu/drm/tinydrm/mipi-dbi.c: In function ‘mipi_dbi_debugfs_command_write’:
      drivers/gpu/drm/tinydrm/mipi-dbi.c:905:8: warning: ‘cmd’ may be used uninitialized in this function [-Wmaybe-uninitialized]
        ret = mipi_dbi_command_buf(mipi, cmd, parameters, i);
              ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      
      cmd can't be used uninitialized, but to satisfy the compiler,
      initialize it to zero.
      Signed-off-by: default avatarNoralf Trønnes <noralf@tronnes.org>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      b401f343
    • Linus Torvalds's avatar
      Merge tag 'usercopy-v4.11-rc1.fix' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · d5500a07
      Linus Torvalds authored
      Pull usercopy test fix from Kees Cook:
       "Fix for non-MMU ARM testing, from Arnd Bergmann"
      
      * tag 'usercopy-v4.11-rc1.fix' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        usercopy: ARM NOMMU has no 64-bit get_user
      d5500a07
  2. 23 Feb, 2017 19 commits
    • Linus Torvalds's avatar
      Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · b2e3c431
      Linus Torvalds authored
      Pull ARM SoC driver updates from Arnd Bergmann:
       "Driver updates for ARM SoCs.
      
        A handful of driver changes this time around. The larger changes are:
      
         - Reset drivers for hi3660 and zx2967
      
         - AHCI driver for Davinci, acked by Tejun and brought in here due to
           platform dependencies
      
         - Cleanups of atmel-ebi (External Bus Interface)
      
         - Tweaks for Rockchip GRF (General Register File) usage (kitchensink
           misc register range on the SoCs)
      
         - PM domains changes for support of two new ZTE SoCs (zx296718 and
           zx2967)"
      
      * tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (53 commits)
        soc: samsung: pmu: Add register defines for pad retention control
        reset: make zx2967 explicitly non-modular
        reset: core: fix reset_control_put
        soc: samsung: pm_domains: Read domain name from the new label property
        soc: samsung: pm_domains: Remove message about failed memory allocation
        soc: samsung: pm_domains: Remove unused name field
        soc: samsung: pm_domains: Use full names in subdomains registration log
        sata: ahci-da850: un-hardcode the MPY bits
        sata: ahci-da850: add a workaround for controller instability
        sata: ahci: export ahci_do_hardreset() locally
        sata: ahci-da850: implement a workaround for the softreset quirk
        sata: ahci-da850: add device tree match table
        sata: ahci-da850: get the sata clock using a connection id
        soc: samsung: pmu: Remove duplicated define for ARM_L2_OPTION register
        memory: atmel-ebi: Enable the SMC clock if specified
        soc: samsung: pmu: Remove unused and duplicated defines
        memory: atmel-ebi: Properly handle multiple reference to the same CS
        memory: atmel-ebi: Fix the test to enable generic SMC logic
        soc: samsung: pm_domains: Add new Exynos5433 compatible
        soc: samsung: pmu: Add dummy support for Exynos5433 SoC
        ...
      b2e3c431
    • Linus Torvalds's avatar
      Merge tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · c61c15e0
      Linus Torvalds authored
      Pull ARM 64-bit DT updates from Arnd Bergmann:
       "ARM64 DT updates are fairly small this time, only two new SoCs and a
        handful of new machines get added, all of them similar to other
        hardware we already support.
      
        New SoC:
      
         - HiSilicon Kirin960/Hi3660 and HiKey960 development board
      
         - NXP LS1012a with three reference boards:
              http://www.nxp.com/products/microcontrollers-and-processors/arm-processors/qoriq-layerscape-arm-processors/qoriq-layerscape-1012a-low-power-communication-processor:LS1012A
      
        New development board:
      
         - Banana Pi M64, based on Allwinner A64:
              http://www.banana-pi.org/m64.html
      
         - SolidRun MACCHIATOBin based on Marvell Armada 8K:
              https://www.solid-run.com/marvell-armada-family/armada-8040-community-board/
      
         - Broadcom BCM958712DxXMC NorthStar2 reference board (another one)
      
        A lot of platforms improve support for existing machines by adding
        extra devices for which a binding and driver is availabe:
      
        Allwinner:
         - MMC, USB
      
        ARM Juno:
         - Coresight, STM
      
        Broadcom:
         - NS2 GICv2m irqchip and PCIe
      
        Marvell:
         - Armada 3700 SPI, I2C, ethernet switch
      
        Mediatek:
         - MT8173 thermal
      
        NXP i.MX:
         - LS1046A thermal
      
        Qualcomm:
         - coresight on MSM8916, HDMI, WCNSS, SCM
      
        Renesas:
         - r8a779[56] thermal, powerdomain, ethernet, sound, pwm, can, can fd
      
        Rockchip:
         - thermal, eDP, pinctrl enhancements
      
        Samsung:
         - TM2 touchkey, Exynos5433 HDMI and power management improvements
      
        UniPhier:
         - SD reset, eMMC controller
      
        ZTE:
         - oppv2 cpufreq"
      
      * tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (110 commits)
        arm64: dts: qcom: Add msm8916 CoreSight components
        arm64: dts: marvell: adjust name of sd-mmc-gop clock in syscon
        arm64: allwinner: add BananaPi-M64 support
        arm64: allwinner: a64: add UART1 pin nodes
        arm64: allwinner: pine64: add MMC support
        arm64: allwinner: a64: Increase the MMC max frequency
        arm64: allwinner: a64: Add MMC pinctrl nodes
        arm64: allwinner: a64: Add MMC nodes
        dt-bindings: clockgen: Add compatible string for LS1012A
        Documentation: DT: add LS1012A compatible for SCFG and DCFG
        Documentation: DT: Add entry for FSL LS1012A RDB, FRDM, QDS boards
        arm64: dts: marvell: add generic-ahci compatibles for CP110 ahci
        arm64: tegra: Use symbolic reset identifiers
        arm64: dts: r8a7796: Mark EthernetAVB device node disabled
        arm64: dts: r8a7795: Mark EthernetAVB device node disabled
        arm64: dts: r8a7795: tidyup audma definition order
        arm64: dts: r8a7796: Link ARM GIC to clock and clock domain
        arm64: dts: r8a7795: Link ARM GIC to clock and clock domain
        arm64: dts: r8a7796: Add R-Car Gen3 thermal support
        arm64: dts: r8a7795: Add R-Car Gen3 thermal support
        ...
      c61c15e0
    • Linus Torvalds's avatar
      Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 195849ea
      Linus Torvalds authored
      Pull ARM DT updates from Arnd Bergmann:
       "A total of 380 patches this time, mostly adding support for more
        hardware in the device tree descriptions. There is not much exciting
        here for 4.11, but I've tried my best to condense the information from
        the pull requests I got into a readable summary.
      
        Noteworthy changes to existing platforms include:
      
         - The GIC memory map was a bit wrong almost everywhere and now gets
           fixed up
      
         - The Allwinner platforms convert to the generic pinmux properties
      
         - The Marvell EBU platforms now use the new DSA binding
      
         - Samsung Exynos4212 was unused and gets removed
      
         - The Renesas power management got improved
      
        New production machines:
      
         - Lego Mindstorms EV3:
              https://www.lego.com/en-us/mindstorms/about-ev3
      
         - Beelink X2 Android media box:
              http://linux-sunxi.org/Beelink_X2
      
         - "Romulus" baseboard management controller for OpenPower
      
         - Axentia TSE-850 Data Radio Channel (DARC) encoder:
              http://www.axentia.se/db/equipment.html
      
         - Luxul XAP-1410 and XWR-1200 wireless access points:
              https://luxul.com/xap-1410
      
        New SoCs:
      
         - Allwinner H2+ and V3s, both minor variations of already supported
           chips:
              http://www.allwinnertech.com/index.php?c=product&a=index&id=38
      
         - Marvell Prestera DX packet processors based on Armada XP
           architecture:
              http://www.marvell.com/switching/prestera-dx/
      
         - Samsung Exynos4412 Prime gets added, a minor variation of
           Exynos4412
      
        New developer and reference boards:
      
         - Lichee Pi One, Lichee Pi Zero and Orange Pi Zero, all based on
           Allwinner SoCs:
              http://linux-sunxi.org/LicheePi_One
              http://www.orangepi.org/orangepizero/
      
         - SAMA5d36ek Reference platform:
              http://www.atmel.com/tools/sama5d36-ek.aspx
      
         - Beaglebone Green Wireless and Black Wireless:
              https://beagleboard.org/black-wireless
              https://beagleboard.org/green-wireless
      
         - phyCORE-AM335x System on Module:
              http://phytec.com/products/system-on-modules/phycore/am335x/
      
         - New revision of "vf610-zii" Zodiac Inflight Innovations board
      
         - Various i.MX System-on-Module: Is.IoT MX6UL, SavageBoard, Engicam
           i.Core:
              http://www.opossom.com/english/index.html
              http://www.savageboard.org/
              http://www.engicam.com/en/products/embedded/som/sodimm/is-iot-mx6ul
              http://www.engicam.com/en/products/embedded/som/sodimm/i-core-m6s-dl-d-q
      
         - Liebherr (LWN) monitor 6 based on i.MX6 Quad, no idea what this is
      
         - Cleanups and bugfixes on at91, bcm53xx, i.MX, mvebu, omap, oxnas,
           qcom, rockchip, sti, stm32 and tegra
      
        New device supports added to some boards and SoCs, briefly by platform:
      
         - Allwinner: SPDIF, A33 cpufreq, A33 Mali GPU
      
         - Aspeed: network, ipmi bt, gpio, pinmux
      
         - Broadcom: video encoder for raspberry pi, qspi, ethernet, sd/mmc
      
         - TI DaVinci: gpio, lcdc, usb, video-in, uart
      
         - TI Keystone 2: MSM RAM, power/reset, uart
      
         - Mediatek MT2701: clocks, iommu, spi, nand, adc, thermal
      
         - Marvell EBU: ethernet switch on Turris Omnia
      
         - NXP i.MX: otp ram, USB, wifi, bluetooth, spdif, spi, pmic, eeprom,
           mmc, nand
      
         - TI OMAP:
      
         - Qualcomm: coresight, gyro/accelerometer, hdmi
      
         - Renesas: pmic, soc-id
      
         - Rockchip: qos
      
         - Samsung: audio on Odroid-X
      
         - Socfpga: FPGA manager, i2c, led, can, watchdog, nand, power monitor
      
         - STi: video in/out
      
         - STM32: timer, pwm, i2c, rtc, add, i2s
      
         - NVIDIA Tegra: tpm
      
         - Uniphier: mmc/sd pinmux"
      
      * tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (380 commits)
        ARM: dts: armada-385-linksys: fix DSA compatible property
        ARM: dts: Fix typo in armada-xp-98dx4251
        ARM: DTS: Fix register map for virt-capable GIC
        dt-bindings: arm,gic: Fix binding example for a virt-capable GIC
        ARM: dts: sun8i: sinlinx: Enable audio nodes
        ARM: dts: sun8i: parrot: Enable audio nodes
        ARM: dts: sun8i: Add audio codec, dai and card for A33
        ARM: dts: Add EMAC AXI settings for Arria10
        ARM: dts: am335x-chiliboard: Support charger
        ARM: dts: am335x-chiliboard: Support power button
        ARM: sun8i: dt: Add mali node
        dt-bindings: gpu: Add Mali Utgard bindings
        ARM: dts: stm32: Add I2C1 support for STM32429 eval board
        ARM: dts: stm32: Add I2C1 support for STM32F429 SoC
        ARM: dts: stm32: Use clock DT binding definition on stm32f429 family
        dt-bindings: mfd: stm32f4: Add missing binding definition
        dt-bindings: mfd: stm32f4: Fix STM32F4_X_CLOCK() macro
        ARM: dts: stm32: Enable pwm1 and pwm3 for stm32f469-disco
        ARM: dts: stm32: add Timers driver for stm32f429 MCU
        ARM: dts: add the AB8500 sysclk to the device trees
        ...
      195849ea
    • Linus Torvalds's avatar
      Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 54fff785
      Linus Torvalds authored
      Pull ARM SoC defconfig updates from Arnd Bergmann:
       "Defconfig additions, removals, etc. Almost all of them just turn on
        drivers that we want on some platform, usually after the driver has
        been merged into mainline.
      
        There is now a new defconfig file for tango4"
      
      * tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (44 commits)
        ARM: multi_v7_defconfig: enable pstore configs
        ARM: multi_v7_defconfig: enable some newly added crypto modules
        ARM: davinci_all_defconfig: enable SATA modules
        arm64: defconfig: enable CONFIG_MTD_NAND and CONFIG_MTD_NAND_DENALI_DT
        arm64: defconfig: enable CONFIG_MTD_BLOCK
        ARM: Import tango4_defconfig
        ARM: omap2plus_defconfig: Enable support for RTC M41T80
        ARM: omap2plus_defconfig: Enable support for micrell phys
        ARM: vf610m4: defconfig: enable EXT4 filesystem
        ARM: omap2plus_defconfig: Fix probe errors on UARTs 5 and 6
        arm64: defconfig: Enable NUMA and NUMA_BALANCING
        arm64: defconfig: enable SMMUv3 config
        ARM: davinci_all_defconfig: enable iio
        ARM: Keystone: Enable ARCH_HAS_RESET_CONTROLLER
        ARM: configs: stm32: Add RTC support in STM32 defconfig
        ARM: defconfig: qcom: add APQ8060 DragonBoard devices
        ARM: qcom_defconfig: enable thermal sensors
        ARM: qcom_defconfig: add ahci configs
        ARM: qcom_defconfig: add pcie and atl1c ethernet configs
        ARM: qcom_defconfig: add usb related configs
        ...
      54fff785
    • Linus Torvalds's avatar
      Merge tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · c35675f3
      Linus Torvalds authored
      Pull ARM SoC 64-bit updates from Arnd Bergmann:
       "Changes to platform code for 64-bit ARM platforms, only trivial stuff
        this time, a few defconfig changes to enable drivers, and a new entry
        for the Cavium ThunderX2 platform"
      
      * tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        MAINTAINERS: Add Cavium ThunderX2 entry
        arm64: add ARCH_THUNDER2 to defconfig
        arm64: add THUNDER2 processor family
        MAINTAINERS: Extend ARM/Mediatek SoC support section
        arm64: defconfig: enable CONFIG_MMC_SDHCI_CADENCE
        arm64: defconfig: enable XORv2 for Marvell Armada 7K/8K
      c35675f3
    • Linus Torvalds's avatar
      Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 6ae52c65
      Linus Torvalds authored
      Pull ARM SoC platform updates from Arnd Bergmann:
       "In the SoC branch we normally collect classic arch/arm/mach-*
        contents, i.e. C code changes for SoC platforms. This release cycle
        the diffstat is quite nice, in that we're removing 3x the amount of
        code that's being added.
      
        The main reason for this is that there's a removal of camera drivers
        for Freescale i.MX chips (driver was removed so the device
        registration isn't needed any more). There's also removal of display
        initialization code for OMAP that is no longer needed.
      
        The rest are mostly minor tweaks and cleanups; constification on
        Samsung platforms, cleanup of ux500 platform data, purge of other
        unused platform data/device seutp on i.MX and other good stuff.
      
        New SoC support this cycle is for two Allwinner platforms, H2+ and
        V3s"
      
      * tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (55 commits)
        ARM: ux500: remove deleted file from Makefile
        ARM: ep93xx: Disable TS-72xx watchdog before uncompressing
        ARM: ux500: cut some platform data
        MAINTAINERS: Update for the current location of the bcm2835 tree.
        ARM: davinci: remove BUG_ON() from da850_register_sata()
        ARM: davinci: da850: model the SATA refclk
        ARM: davinci: da850: add con_id for the SATA clock
        ARM: davinci: da8xx-dt: add OF_DEV_AUXDATA entry for SATA
        arm: mvebu: support for SMP on 98DX3336 SoC
        dt-bindings: video: exynos7-decon: Remove obsolete samsung,power-domain property
        soc: dove: constify reset_control_ops structures
        ARM: mv78xx0: fix possible PCI buffer overflow
        MAINTAINERS: transfer maintainership for the EZX platform
        ARM: shmobile: rcar-gen2: Add more register documentation
        ARM: tegra: paz00: Fix __initdata placement
        ARM: OMAP: clock: Remove unused mpurate cmdline option
        ARM: davinci: add skeleton for pdata-quirks
        arm: sunxi: add support for V3s SoC
        ARM: OMAP2+: omap_hwmod: Add support for earlycon
        arm: hisi: drop extern hip01_cpu_die
        ...
      6ae52c65
    • Linus Torvalds's avatar
      Merge tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · af8999f6
      Linus Torvalds authored
      Pull ARM SoC non-urgent fixes from Arnd Bergmann:
       "We sometimes collect non-critical fixes that come in during the later
        part of the merge window in a branch for the next release instead, and
        this is that contents for v4.11.
      
        Most of these are OMAP fixes, dealing with OMAP36/37 detection, quirks
        and setup. There's also some fixes for Davinci and a Kconfig fix for
        SCPI to only enable on ARM{,64}"
      
      * tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        firmware: arm_scpi: Add hardware dependencies
        ARM: OMAP3: Fix SoC detection of OMAP36/37 Family
        ARM: OMAP5: Add HWMOD_SWSUP_SIDLE_ACT flag for UART
        ARM: dts: Fix compatible for ti81xx uarts for 8250
        ARM: dts: Fix am335x and dm814x scm syscon to probe children
        ARM: OMAP2+: Fix init for multiple quirks for the same SoC
        ARM: dts: Fix omap3 off mode pull defines
        bus: da850-mstpri: fix my e-mail address
        ARM: davinci: da850: fix da850_set_pll0rate()
        ARM: davinci: da850: coding style fix
      af8999f6
    • Dave Airlie's avatar
      Merge branch 'drm-next-4.11' of git://people.freedesktop.org/~agd5f/linux into drm-next · 1e8ad3d8
      Dave Airlie authored
      Some ttm/amd fixes.
      
      * 'drm-next-4.11' of git://people.freedesktop.org/~agd5f/linux:
        drm/amd/powerplay: fix PSI feature on Polars12.
        drm/amdgpu: refuse to reserve io mem for split VRAM buffers
        drm/ttm: fix use-after-free races in vm fault handling
        drm/amd/amdgpu: post card if there is real hw resetting performed
      1e8ad3d8
    • Dave Airlie's avatar
      Merge tag 'drm/panel/for-4.11-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next · 894ebc41
      Dave Airlie authored
      drm/panel: Changes for v4.11-rc1
      
      This set contains a couple of cleanups as well as support for a few more
      simple panels.
      
      * tag 'drm/panel/for-4.11-rc1' of git://anongit.freedesktop.org/tegra/linux:
        drm/panel: simple: Specify bus width and flags for EDT displays
        drm/panel: simple: Add Netron DY E231732
        of: Add vendor prefix for Netron DY
        drm/panel: simple: Add support for Tianma TM070JDHG30
        of: Add vendor prefix for Tianma Micro-electronics
        drm/panel: simple: Add support BOE NV101WXMN51
        dt-bindings: display: Add BOE NV101WXMN51 panel binding
        drm/panel: Constify device node argument to of_drm_find_panel()
      894ebc41
    • Dave Airlie's avatar
      Merge tag 'drm/tegra/for-4.11-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next · 84f7174b
      Dave Airlie authored
      drm/tegra: Changes for v4.11-rc1
      
      Just a single change that hooks up the Tegra DRM parent device to the
      correct device tree node.
      
      * tag 'drm/tegra/for-4.11-rc1' of git://anongit.freedesktop.org/tegra/linux:
        gpu: host1x: Set OF node for new host1x devices
      84f7174b
    • Linus Torvalds's avatar
      Merge tag 'pci-v4.11-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 60e8d3e1
      Linus Torvalds authored
      Pull PCI updates from Bjorn Helgaas:
      
       - add ASPM L1 substate support
      
       - enable PCIe Extended Tags when supported
      
       - configure PCIe MPS settings on iProc, Versatile, X-Gene, and Xilinx
      
       - increase VPD access timeout
      
       - add ACS quirks for Intel Union Point, Qualcomm QDF2400 and QDF2432
      
       - use new pci_irq_alloc_vectors() in more drivers
      
       - fix MSI affinity memory leak
      
       - remove unused MSI interfaces and update documentation
      
       - remove unused AER .link_reset() callback
      
       - avoid pci_lock / p->pi_lock deadlock seen with perf
      
       - serialize sysfs enable/disable num_vfs operations
      
       - move DesignWare IP from drivers/pci/host/ to drivers/pci/dwc/ and
         refactor so we can support both hosts and endpoints
      
       - add DT ECAM-like support for HiSilicon Hip06/Hip07 controllers
      
       - add Rockchip system power management support
      
       - add Thunder-X cn81xx and cn83xx support
      
       - add Exynos 5440 PCIe PHY support
      
      * tag 'pci-v4.11-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (93 commits)
        PCI: dwc: Remove dependency of designware on CONFIG_PCI
        PCI: dwc: Add CONFIG_PCIE_DW_HOST to enable PCI dwc host
        PCI: dwc: Split pcie-designware.c into host and core files
        PCI: dwc: designware: Fix style errors in pcie-designware.c
        PCI: dwc: designware: Parse "num-lanes" property in dw_pcie_setup_rc()
        PCI: dwc: all: Split struct pcie_port into host-only and core structures
        PCI: dwc: designware: Get device pointer at the start of dw_pcie_host_init()
        PCI: dwc: all: Rename cfg_read/cfg_write to read/write
        PCI: dwc: all: Use platform_set_drvdata() to save private data
        PCI: dwc: designware: Move register defines to designware header file
        PCI: dwc: Use PTR_ERR_OR_ZERO to simplify code
        PCI: dra7xx: Group PHY API invocations
        PCI: dra7xx: Enable MSI and legacy interrupts simultaneously
        PCI: dra7xx: Add support to force RC to work in GEN1 mode
        PCI: dra7xx: Simplify probe code with devm_gpiod_get_optional()
        PCI: Move DesignWare IP support to new drivers/pci/dwc/ directory
        PCI: exynos: Support the PHY generic framework
        Documentation: binding: Modify the exynos5440 PCIe binding
        phy: phy-exynos-pcie: Add support for Exynos PCIe PHY
        Documentation: samsung-phy: Add exynos-pcie-phy binding
        ...
      60e8d3e1
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 190c3ee0
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Some 'const'ing in qlogic networking drivers, from Bhumika Goyal.
      
       2) Fix scheduling while atomic in l2tp network namespace exit by
          deferring the work to the workqueue. From Ridge Kennedy.
      
       3) Fix use after free in dccp timewait handling, from Andrey Ryabinin.
      
       4) mlx5e CQE compression engine not initialized properly, from Tariq
          Toukan.
      
       5) Some UAPI header fixes from Dmitry V. Levin.
      
       6) Don't overwrite module parameter value in mlx4 driver, from Majd
          Dibbiny.
      
       7) Fix divide by zero in xt_hashlimit netfilter module, from Alban
          Browaeys.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (35 commits)
        bpf: Fix bpf_xdp_event_output
        net/mlx4_en: Use __skb_fill_page_desc()
        net/mlx4_core: Use cq quota in SRIOV when creating completion EQs
        net/mlx4_core: Fix VF overwrite of module param which disables DMFS on new probed PFs
        net/mlx4: Spoofcheck and zero MAC can't coexist
        net/mlx4: Change ENOTSUPP to EOPNOTSUPP
        uapi: fix linux/rds.h userspace compilation errors
        uapi: fix linux/seg6.h and linux/seg6_iptunnel.h userspace compilation errors
        lib: Remove string from parman config selection
        forcedeth: Remove return from a void function
        bpf: fix spelling mistake: "proccessed" -> "processed"
        uapi: fix linux/llc.h userspace compilation error
        uapi: fix linux/ip6_tunnel.h userspace compilation errors
        net/mlx5e: Fix wrong CQE decompression
        net/mlx5e: Update MPWQE stride size when modifying CQE compress state
        net/mlx5e: Fix broken CQE compression initialization
        net/mlx5e: Do not reduce LRO WQE size when not using build_skb
        net/mlx5e: Register/unregister vport representors on interface attach/detach
        net/mlx5e: s390 system compilation fix
        tcp: account for ts offset only if tsecr not zero
        ...
      190c3ee0
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma · af17fe7a
      Linus Torvalds authored
      Pull Mellanox rdma updates from Doug Ledford:
       "Mellanox specific updates for 4.11 merge window
      
        Because the Mellanox code required being based on a net-next tree, I
        keept it separate from the remainder of the RDMA stack submission that
        is based on 4.10-rc3.
      
        This branch contains:
      
         - Various mlx4 and mlx5 fixes and minor changes
      
         - Support for adding a tag match rule to flow specs
      
         - Support for cvlan offload operation for raw ethernet QPs
      
         - A change to the core IB code to recognize raw eth capabilities and
           enumerate them (touches non-Mellanox code)
      
         - Implicit On-Demand Paging memory registration support"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (40 commits)
        IB/mlx5: Fix configuration of port capabilities
        IB/mlx4: Take source GID by index from HW GID table
        IB/mlx5: Fix blue flame buffer size calculation
        IB/mlx4: Remove unused variable from function declaration
        IB: Query ports via the core instead of direct into the driver
        IB: Add protocol for USNIC
        IB/mlx4: Support raw packet protocol
        IB/mlx5: Support raw packet protocol
        IB/core: Add raw packet protocol
        IB/mlx5: Add implicit MR support
        IB/mlx5: Expose MR cache for mlx5_ib
        IB/mlx5: Add null_mkey access
        IB/umem: Indicate that process is being terminated
        IB/umem: Update on demand page (ODP) support
        IB/core: Add implicit MR flag
        IB/mlx5: Support creation of a WQ with scatter FCS offload
        IB/mlx5: Enable QP creation with cvlan offload
        IB/mlx5: Enable WQ creation and modification with cvlan offload
        IB/mlx5: Expose vlan offloads capabilities
        IB/uverbs: Enable QP creation with cvlan offload
        ...
      af17fe7a
    • Linus Torvalds's avatar
      Merge tag 'vfio-v4.11-rc1' of git://github.com/awilliam/linux-vfio · f14cc3b1
      Linus Torvalds authored
      Pull VFIO updates from Alex Williamson:
      
       - Kconfig fixes for SPAPR_TCE_IOMMU=n (Michael Ellerman)
      
       - Module softdep rather than request_module to simplify usage from
         initrd (Alex Williamson)
      
       - Comment typo fix (Changbin Du)
      
      * tag 'vfio-v4.11-rc1' of git://github.com/awilliam/linux-vfio:
        vfio: fix a typo in comment of function vfio_pin_pages
        vfio: Replace module request with softdep
        vfio/mdev: Use a module softdep for vfio_mdev
        vfio: Fix build break when SPAPR_TCE_IOMMU=n
      f14cc3b1
    • Martin KaFai Lau's avatar
      bpf: Fix bpf_xdp_event_output · 9c471370
      Martin KaFai Lau authored
      Fix a typo. xdp->data instead of xdp should be copied to the perf-event's
      dst_buff.
      
      Fixes: 4de16969 ("bpf: enable event output helper also for xdp types")
      Reported-by: default avatarHuapeng Zhou <hzhou@fb.com>
      Tested-by: default avatarFeixiong Zhang <feixiong@fb.com>
      Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
      Cc: Daniel Borkmann <daniel@iogearbox.net>
      Signed-off-by: default avatarMartin KaFai Lau <kafai@fb.com>
      Acked-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      9c471370
    • Linus Torvalds's avatar
      Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 5bcbe22c
      Linus Torvalds authored
      Pull crypto update from Herbert Xu:
       "API:
         - Try to catch hash output overrun in testmgr
         - Introduce walksize attribute for batched walking
         - Make crypto_xor() and crypto_inc() alignment agnostic
      
        Algorithms:
         - Add time-invariant AES algorithm
         - Add standalone CBCMAC algorithm
      
        Drivers:
         - Add NEON acclerated chacha20 on ARM/ARM64
         - Expose AES-CTR as synchronous skcipher on ARM64
         - Add scalar AES implementation on ARM64
         - Improve scalar AES implementation on ARM
         - Improve NEON AES implementation on ARM/ARM64
         - Merge CRC32 and PMULL instruction based drivers on ARM64
         - Add NEON acclerated CBCMAC/CMAC/XCBC AES on ARM64
         - Add IPsec AUTHENC implementation in atmel
         - Add Support for Octeon-tx CPT Engine
         - Add Broadcom SPU driver
         - Add MediaTek driver"
      
      * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (142 commits)
        crypto: xts - Add ECB dependency
        crypto: cavium - switch to pci_alloc_irq_vectors
        crypto: cavium - switch to pci_alloc_irq_vectors
        crypto: cavium - remove dead MSI-X related define
        crypto: brcm - Avoid double free in ahash_finup()
        crypto: cavium - fix Kconfig dependencies
        crypto: cavium - cpt_bind_vq_to_grp could return an error code
        crypto: doc - fix typo
        hwrng: omap - update Kconfig help description
        crypto: ccm - drop unnecessary minimum 32-bit alignment
        crypto: ccm - honour alignmask of subordinate MAC cipher
        crypto: caam - fix state buffer DMA (un)mapping
        crypto: caam - abstract ahash request double buffering
        crypto: caam - fix error path for ctx_dma mapping failure
        crypto: caam - fix DMA API leaks for multiple setkey() calls
        crypto: caam - don't dma_map key for hash algorithms
        crypto: caam - use dma_map_sg() return code
        crypto: caam - replace sg_count() with sg_nents_for_len()
        crypto: caam - check sg_count() return value
        crypto: caam - fix HW S/G in ablkcipher_giv_edesc_alloc()
        ..
      5bcbe22c
    • Linus Torvalds's avatar
      Merge tag 'rpmsg-v4.11' of git://github.com/andersson/remoteproc · 1db934a5
      Linus Torvalds authored
      Pull rpmsg updates from Bjorn Andersson:
       "This introduces an interface for user space to directly communicate on
        rpmsg endpoints without the implementation of specific kernel drivers,
        which is useful for e.g. debug channels:
      
      * tag 'rpmsg-v4.11' of git://github.com/andersson/remoteproc:
        rpmsg: rpmsg_create_ept() returns NULL on error
        rpmsg: qcom: smd: Return positively when not enabled
        rpmsg: unlock on error in rpmsg_eptdev_read()
        rpmsg: char: add CONFIG_NET dependency
        rpmsg: smd: Register rpmsg user space interface for edges
        rpmsg: Driver for user space endpoint interface
        rpmsg: qcom_smd: Implement endpoint "poll"
        rpmsg: Introduce "poll" to endpoint ops
        rpmsg: qcom_smd: Add support for "label" property
      1db934a5
    • Linus Torvalds's avatar
      Merge tag 'rproc-v4.11' of git://github.com/andersson/remoteproc · a3919caa
      Linus Torvalds authored
      Pull remoteproc updates from Bjorn Andersson:
       "This introduces support for booting the dedicated sensor core in the
        Qualcomm MSM8996, updates the Qualcomm ADSP and Hexagon drivers to
        utilize SMD subdevice helpers for properly handle shutdowns and
        restarts of the remoteproc, add virtio support to the ST remoteproc
        and refactor the Qualcomm Hexagon driver to handle variations between
        platforms.
      
        The support code for parsing, loading and authenticating Qualcomm
        firmware files (MDT) is refactored and move to drivers/soc/qcom, to
        allow for non-remoteproc drivers to utilize this.
      
        Finally it brings some cleanups to the remoteproc core"
      
      * tag 'rproc-v4.11' of git://github.com/andersson/remoteproc: (27 commits)
        remoteproc: qcom: mdt_loader: Use signed type for offset
        remoteproc: st: add virtio communication support
        remoteproc: st: correct probe error management
        remoteproc: Modify the function names
        remoteproc: Reduce asynchronous request_firmware to auto-boot only
        remoteproc: Drop qcom_scm_pas_supported() from adsp_probe()
        MAINTAINERS: Add missing rpmsg include path
        remoteproc: qcom: Use common SMD edge handler
        remoteproc: qcom: wcnss: Make SMD handling common
        remoteproc: Move qcom_mdt_loader into drivers/soc/qcom
        remoteproc: qcom: mdt_loader: Refactor MDT loader
        remoteproc: qcom: mdt_loader: Don't overwrite firmware object
        remoteproc: qcom: Extract non-mdt related helper
        remoteproc: qcom: q6v5: Decouple driver from MDT loader
        remoteproc: qcom: q6v5: Remove mss supply from 8916
        remoteproc: qcom: fix initializers for qcom_mss_reg_res array
        remoteproc: Drop firmware_loading_complete
        remoteproc: Add RPROC_DELETED state
        remoteproc: Move rproc_delete_debug_dir() to rproc_del()
        remoteproc: qcom: Add SLPI rproc support to load and boot slpi proc.
        ...
      a3919caa
    • Linus Torvalds's avatar
      Merge tag 'gfs2-4.11.addendum' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 · 15192b02
      Linus Torvalds authored
      Pull GFS2 fix from Bob Peterson:
       "This is an addendum for the 4.11 merge window.
      
        Andy Price wrote this patch to close a nasty race condition that
        allows access to glocks that are being destroyed. Without this patch,
        GFS2 is vulnerable to random corruption and kernel panic"
      
      * tag 'gfs2-4.11.addendum' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
        gfs2: Add missing rcu locking for glock	lookup
      15192b02