1. 27 Jan, 2017 1 commit
    • Dave Airlie's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next · b0df0b25
      Dave Airlie authored
      Backmerge Linus master to get the connector locking revert.
      
      * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux: (645 commits)
        sysctl: fix proc_doulongvec_ms_jiffies_minmax()
        Revert "drm/probe-helpers: Drop locking from poll_enable"
        MAINTAINERS: add Dan Streetman to zbud maintainers
        MAINTAINERS: add Dan Streetman to zswap maintainers
        mm: do not export ioremap_page_range symbol for external module
        mn10300: fix build error of missing fpu_save()
        romfs: use different way to generate fsid for BLOCK or MTD
        frv: add missing atomic64 operations
        mm, page_alloc: fix premature OOM when racing with cpuset mems update
        mm, page_alloc: move cpuset seqcount checking to slowpath
        mm, page_alloc: fix fast-path race with cpuset update or removal
        mm, page_alloc: fix check for NULL preferred_zone
        kernel/panic.c: add missing \n
        fbdev: color map copying bounds checking
        frv: add atomic64_add_unless()
        mm/mempolicy.c: do not put mempolicy before using its nodemask
        radix-tree: fix private list warnings
        Documentation/filesystems/proc.txt: add VmPin
        mm, memcg: do not retry precharge charges
        proc: add a schedule point in proc_pid_readdir()
        ...
      b0df0b25
  2. 26 Jan, 2017 3 commits
    • Eric Dumazet's avatar
      sysctl: fix proc_doulongvec_ms_jiffies_minmax() · ff9f8a7c
      Eric Dumazet authored
      We perform the conversion between kernel jiffies and ms only when
      exporting kernel value to user space.
      
      We need to do the opposite operation when value is written by user.
      
      Only matters when HZ != 1000
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ff9f8a7c
    • Linus Torvalds's avatar
      Merge tag 'pinctrl-v4.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · 928d336a
      Linus Torvalds authored
      Pull pin control fixes from Linus Walleij:
       "A bunch of pin control fixes for v4.10 that didn't get sent off until
        now, sorry for the delay.
      
        It's only driver fixes:
      
         - A bunch of fixes to the Intel drivers: broxton, baytrail. Bugs
           related to register offsets, IRQ, debounce functionality.
      
         - Fix a conflict amongst UART settings on the meson.
      
         - Fix the ethernet setting on the Uniphier.
      
         - A compilation warning squelched"
      
      * tag 'pinctrl-v4.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
        pinctrl: uniphier: fix Ethernet (RMII) pin-mux setting for LD20
        pinctrl: meson: fix uart_ao_b for GXBB and GXL/GXM
        pinctrl: amd: avoid maybe-uninitalized warning
        pinctrl: baytrail: Do not add all GPIOs to IRQ domain
        pinctrl: baytrail: Rectify debounce support
        pinctrl: intel: Set pin direction properly
        pinctrl: broxton: Use correct PADCFGLOCK offset
      928d336a
    • Linus Torvalds's avatar
      Merge tag 'drm-fixes-for-v4.10-rc6-revert-one' of git://people.freedesktop.org/~airlied/linux · bed7b016
      Linus Torvalds authored
      Pull drm revert from Dave Airlie:
       "Revert one patch missing some prereqs.
      
        One of the connector fixes was missing some prereqs, we have an
        alternate driver fix that should work that I'll send tomorrow.
      
        Today is a holiday here so quickly smashing this out"
      
      Daniel Vetter explains:
       "I pushed a locking change to fix a nouveau rpm issue to -fixes that
        needed the connector_list rework. And that's only in -next, but I
        missed that. Dave has the revert in a pull, and he'll follow-up with
        the hack nouveau patch for 4.10, and then we'll reapply the proper fix
        again for -next and revert the hacks. A bit a mess, but should be
        sorted soon"
      
      * tag 'drm-fixes-for-v4.10-rc6-revert-one' of git://people.freedesktop.org/~airlied/linux:
        Revert "drm/probe-helpers: Drop locking from poll_enable"
      bed7b016
  3. 25 Jan, 2017 29 commits
  4. 24 Jan, 2017 6 commits
    • Will Deacon's avatar
      vring: Force use of DMA API for ARM-based systems with legacy devices · c7070619
      Will Deacon authored
      Booting Linux on an ARM fastmodel containing an SMMU emulation results
      in an unexpected I/O page fault from the legacy virtio-blk PCI device:
      
      [    1.211721] arm-smmu-v3 2b400000.smmu: event 0x10 received:
      [    1.211800] arm-smmu-v3 2b400000.smmu:	0x00000000fffff010
      [    1.211880] arm-smmu-v3 2b400000.smmu:	0x0000020800000000
      [    1.211959] arm-smmu-v3 2b400000.smmu:	0x00000008fa081002
      [    1.212075] arm-smmu-v3 2b400000.smmu:	0x0000000000000000
      [    1.212155] arm-smmu-v3 2b400000.smmu: event 0x10 received:
      [    1.212234] arm-smmu-v3 2b400000.smmu:	0x00000000fffff010
      [    1.212314] arm-smmu-v3 2b400000.smmu:	0x0000020800000000
      [    1.212394] arm-smmu-v3 2b400000.smmu:	0x00000008fa081000
      [    1.212471] arm-smmu-v3 2b400000.smmu:	0x0000000000000000
      
      <system hangs failing to read partition table>
      
      This is because the legacy virtio-blk device is behind an SMMU, so we
      have consequently swizzled its DMA ops and configured the SMMU to
      translate accesses. This then requires the vring code to use the DMA API
      to establish translations, otherwise all transactions will result in
      fatal faults and termination.
      
      Given that ARM-based systems only see an SMMU if one is really present
      (the topology is all described by firmware tables such as device-tree or
      IORT), then we can safely use the DMA API for all legacy virtio devices.
      Modern devices can advertise the prescense of an IOMMU using the
      VIRTIO_F_IOMMU_PLATFORM feature flag.
      
      Cc: Andy Lutomirski <luto@kernel.org>
      Cc: Michael S. Tsirkin <mst@redhat.com>
      Cc: <stable@vger.kernel.org>
      Fixes: 876945db ("arm64: Hook up IOMMU dma_ops")
      Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
      Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
      Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
      c7070619
    • Robin Murphy's avatar
      virtio_mmio: Set DMA masks appropriately · f7f6634d
      Robin Murphy authored
      Once DMA API usage is enabled, it becomes apparent that virtio-mmio is
      inadvertently relying on the default 32-bit DMA mask, which leads to
      problems like rapidly exhausting SWIOTLB bounce buffers.
      
      Ensure that we set the appropriate 64-bit DMA mask whenever possible,
      with the coherent mask suitably limited for the legacy vring as per
      a0be1db4 ("virtio_pci: Limit DMA mask to 44 bits for legacy virtio
      devices").
      
      Cc: Andy Lutomirski <luto@kernel.org>
      Cc: Michael S. Tsirkin <mst@redhat.com>
      Reported-by: default avatarJean-Philippe Brucker <jean-philippe.brucker@arm.com>
      Fixes: b4211138 ("virtio_mmio: Use the DMA API if enabled")
      Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
      Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
      f7f6634d
    • Stefan Hajnoczi's avatar
      vhost/vsock: handle vhost_vq_init_access() error · 0516ffd8
      Stefan Hajnoczi authored
      Propagate the error when vhost_vq_init_access() fails and set
      vq->private_data to NULL.
      Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
      Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
      0516ffd8
    • Linus Torvalds's avatar
      Merge tag 'platform-drivers-x86-v4.10-4' of git://git.infradead.org/linux-platform-drivers-x86 · 0263d4eb
      Linus Torvalds authored
      Pull x86 platform-driver fixes from Andy Shevchenko:
       "This is my first pull request since I become a co-maintainer of
        Platform Drivers x86 subsystem. It's a bit bigger than usual due to
        material collected for almost two weeks in a row.
      
        MAINTAINERS:
         - Add myself to X86 PLATFORM DRIVERS as a co-maintainer
      
        ideapad-laptop:
         - handle ACPI event 1
      
        intel_mid_powerbtn:
         - Set IRQ_ONESHOT
      
        surface3-wmi:
         - fix uninitialized symbol
         - Shut up unused-function warning
      
        mlx-platform:
         - free first dev on error"
      
      * tag 'platform-drivers-x86-v4.10-4' of git://git.infradead.org/linux-platform-drivers-x86:
        MAINTAINERS: Add myself to X86 PLATFORM DRIVERS as a co-maintainer
        platform/x86: ideapad-laptop: handle ACPI event 1
        platform/x86: intel_mid_powerbtn: Set IRQ_ONESHOT
        platform/x86: surface3-wmi: fix uninitialized symbol
        platform/x86: surface3-wmi: Shut up unused-function warning
        platform/x86: mlx-platform: free first dev on error
      0263d4eb
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace · 19ca2c8f
      Linus Torvalds authored
      Pull namespace fix from Eric Biederman:
       "This has a single brown bag fix.
      
        The possible deadlock with dec_pid_namespaces that I had thought was
        fixed earlier turned out only to have been moved. So instead of being
        cleaver this change takes ucounts_lock with irqs disabled. So
        dec_ucount can be used from any context without fear of deadlock.
      
        The items accounted for dec_ucount and inc_ucount are all
        comparatively heavy weight objects so I don't exepct this will have
        any measurable performance impact"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
        userns: Make ucounts lock irq-safe
      19ca2c8f
    • Andy Shevchenko's avatar
      MAINTAINERS: Add myself to X86 PLATFORM DRIVERS as a co-maintainer · 7b9e1d89
      Andy Shevchenko authored
      For last few months Darren and I are co-maintaining PDx86 subsystem.
      Make this fact official by updating MAINTAINERS database.
      Acked-by: default avatarDarren Hart <dvhart@linux.intel.com>
      Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
      7b9e1d89
  5. 23 Jan, 2017 1 commit