1. 11 Aug, 2017 3 commits
    • Peter Zijlstra's avatar
      mm, locking: Fix up flush_tlb_pending() related merge in do_huge_pmd_numa_page() · ccde85ba
      Peter Zijlstra authored
      Merge commit:
      
        040cca3a ("Merge branch 'linus' into locking/core, to resolve conflicts")
      
      overlooked the fact that do_huge_pmd_numa_page() now does two TLB
      flushes. Commit:
      
        8b1b436d ("mm, locking: Rework {set,clear,mm}_tlb_flush_pending()")
      
      and commit:
      
        a9b80250 ("Revert "mm: numa: defer TLB flush for THP migration as long as possible"")
      
      Both moved the TLB flush around but slightly different, the end result
      being that what was one became two.
      
      Clean this up.
      Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Cc: David S. Miller <davem@davemloft.net>
      Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Mel Gorman <mgorman@suse.de>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Ralf Baechle <ralf@linux-mips.org>
      Cc: Rik van Riel <riel@redhat.com>
      Cc: Russell King <linux@armlinux.org.uk>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Vineet Gupta <vgupta@synopsys.com>
      Cc: Will Deacon <will.deacon@arm.com>
      Cc: linux-kernel@vger.kernel.org
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      ccde85ba
    • Ingo Molnar's avatar
      Merge branch 'linus' into locking/core, to resolve conflicts · 040cca3a
      Ingo Molnar authored
       Conflicts:
      	include/linux/mm_types.h
      	mm/huge_memory.c
      
      I removed the smp_mb__before_spinlock() like the following commit does:
      
        8b1b436d ("mm, locking: Rework {set,clear,mm}_tlb_flush_pending()")
      
      and fixed up the affected commits.
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      040cca3a
    • Linus Torvalds's avatar
      Merge tag 'drm-fixes-for-v4.13-rc5' of git://people.freedesktop.org/~airlied/linux · b2dbdf2c
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Nothing too earth shattering here, it just seems like lots of little
        things all over the place.
      
        msm has probably the larger amount of changes, but they all seem fine,
        otherwise, some rockchip, i915, etnaviv and exynos fixes, along with
        one nouveau regression fix for some older GPUs"
      
      * tag 'drm-fixes-for-v4.13-rc5' of git://people.freedesktop.org/~airlied/linux: (35 commits)
        drm/nouveau/disp/nv04: avoid creation of output paths
        drm: make DRM_STM default n
        drm/exynos: forbid creating framebuffers from too small GEM buffers
        drm/etnaviv: Fix off-by-one error in reloc checking
        drm/i915: fix backlight invert for non-zero minimum brightness
        drm/i915/shrinker: Wrap need_resched() inside preempt-disable
        drm/i915/perf: fix flex eu registers programming
        drm/i915: Fix out-of-bounds array access in bdw_load_gamma_lut
        drm/i915/gvt: Change the max length of mmio_reg_rw from 4 to 8
        drm/i915/gvt: Initialize MMIO Block with HW state
        drm/rockchip: vop: report error when check resource error
        drm/rockchip: vop: round_up pitches to word align
        drm/rockchip: vop: fix NV12 video display error
        drm/rockchip: vop: fix iommu page fault when resume
        drm/i915/gvt: clean workload queue if error happened
        drm/i915/gvt: change resetting to resetting_eng
        drm/msm: gpu: don't abuse dma_alloc for non-DMA allocations
        drm/msm: gpu: call qcom_mdt interfaces only for ARCH_QCOM
        drm/msm/adreno: Prevent unclocked access when retrieving timestamps
        drm/msm: Remove __user from __u64 data types
        ...
      b2dbdf2c
  2. 10 Aug, 2017 37 commits