The patch titled
Subject: linux-next-git-rejects
has been added to the -mm tree. Its filename is
linux-next-git-rejects.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/linux-next-git-rejects.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/linux-next-git-rejects.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: linux-next-git-rejects
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/i915/gem/i915_gem_mman.c | 7 ----
drivers/gpu/drm/i915/gem/i915_gem_pm.c | 4 --
drivers/gpu/drm/i915/gt/intel_lrc.c | 14 --------
drivers/gpu/drm/i915/i915_drv.c | 7 ----
drivers/gpu/drm/i915/i915_request.c | 32 --------------------
drivers/gpu/drm/i915/selftests/i915_gem.c | 7 ----
6 files changed, 71 deletions(-)
--- a/drivers/gpu/drm/i915/gem/i915_gem_mman.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/gem/i915_gem_mman.c
@@ -247,13 +247,6 @@ vm_fault_t i915_gem_fault(struct vm_faul
wakeref = intel_runtime_pm_get(rpm);
ret = intel_gt_reset_trylock(ggtt->vm.gt, &srcu);
-<<<<<<< HEAD
- if (ret)
- goto err_rpm;
-
- ret = i915_mutex_lock_interruptible(dev);
-=======
->>>>>>> linux-next/akpm-base
if (ret)
goto err_rpm;
--- a/drivers/gpu/drm/i915/gem/i915_gem_pm.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/gem/i915_gem_pm.c
@@ -176,11 +176,7 @@ void i915_gem_resume(struct drm_i915_pri
intel_uncore_forcewake_get(&i915->uncore, FORCEWAKE_ALL);
-<<<<<<< HEAD
- if (i915_gem_init_hw(i915))
-=======
if (intel_gt_init_hw(&i915->gt))
->>>>>>> linux-next/akpm-base
goto err_wedged;
/*
--- a/drivers/gpu/drm/i915/gt/intel_lrc.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/gt/intel_lrc.c
@@ -1624,10 +1624,7 @@ static void execlists_dequeue(struct int
submit = true;
last = rq;
}
-<<<<<<< HEAD
-=======
i915_request_put(rq);
->>>>>>> linux-next/akpm-base
/*
* Hmm, we have a bunch of virtual engine requests,
@@ -2725,19 +2722,11 @@ static struct i915_request *active_reque
const struct intel_context * const ce = rq->hw_context;
struct i915_request *active = NULL;
struct list_head *list;
-<<<<<<< HEAD
-
- if (!i915_request_is_active(rq)) /* unwound, but incomplete! */
- return rq;
-
- list = &rq->timeline->requests;
-=======
if (!i915_request_is_active(rq)) /* unwound, but incomplete! */
return rq;
list = &i915_request_active_timeline(rq)->requests;
->>>>>>> linux-next/akpm-base
list_for_each_entry_from_reverse(rq, list, link) {
if (i915_request_completed(rq))
break;
@@ -2919,10 +2908,7 @@ static void execlists_cancel_requests(st
int i;
priolist_for_each_request_consume(rq, rn, p, i) {
-<<<<<<< HEAD
-=======
mark_eio(rq);
->>>>>>> linux-next/akpm-base
__i915_request_submit(rq);
}
--- a/drivers/gpu/drm/i915/i915_drv.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/i915_drv.c
@@ -1803,15 +1803,8 @@ static int i915_drm_resume(struct drm_de
if (ret)
DRM_ERROR("failed to re-enable GGTT\n");
-<<<<<<< HEAD
- mutex_lock(&dev_priv->drm.struct_mutex);
i915_gem_restore_gtt_mappings(dev_priv);
i915_gem_restore_fences(dev_priv);
- mutex_unlock(&dev_priv->drm.struct_mutex);
-=======
- i915_gem_restore_gtt_mappings(dev_priv);
- i915_gem_restore_fences(dev_priv);
->>>>>>> linux-next/akpm-base
intel_csr_ucode_resume(dev_priv);
--- a/drivers/gpu/drm/i915/i915_request.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/i915_request.c
@@ -196,30 +196,6 @@ static void free_capture_list(struct i91
}
static void remove_from_engine(struct i915_request *rq)
-<<<<<<< HEAD
-{
- struct intel_engine_cs *engine, *locked;
-
- /*
- * Virtual engines complicate acquiring the engine timeline lock,
- * as their rq->engine pointer is not stable until under that
- * engine lock. The simple ploy we use is to take the lock then
- * check that the rq still belongs to the newly locked engine.
- */
- locked = READ_ONCE(rq->engine);
- spin_lock(&locked->active.lock);
- while (unlikely(locked != (engine = READ_ONCE(rq->engine)))) {
- spin_unlock(&locked->active.lock);
- spin_lock(&engine->active.lock);
- locked = engine;
- }
- list_del(&rq->sched.link);
- spin_unlock(&locked->active.lock);
-}
-
-static bool i915_request_retire(struct i915_request *rq)
-=======
->>>>>>> linux-next/akpm-base
{
struct intel_engine_cs *engine, *locked;
@@ -427,19 +403,11 @@ bool __i915_request_submit(struct i915_r
engine->emit_fini_breadcrumb(request,
request->ring->vaddr + request->postfix);
-<<<<<<< HEAD
-
- trace_i915_request_execute(request);
- engine->serial++;
- result = true;
-
-=======
trace_i915_request_execute(request);
engine->serial++;
result = true;
->>>>>>> linux-next/akpm-base
xfer: /* We may be recursing from the signal callback of another i915 fence */
spin_lock_nested(&request->lock, SINGLE_DEPTH_NESTING);
--- a/drivers/gpu/drm/i915/selftests/i915_gem.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/selftests/i915_gem.c
@@ -119,15 +119,8 @@ static void pm_resume(struct drm_i915_pr
intel_gt_sanitize(&i915->gt, false);
i915_gem_sanitize(i915);
-<<<<<<< HEAD
- mutex_lock(&i915->drm.struct_mutex);
i915_gem_restore_gtt_mappings(i915);
i915_gem_restore_fences(i915);
- mutex_unlock(&i915->drm.struct_mutex);
-=======
- i915_gem_restore_gtt_mappings(i915);
- i915_gem_restore_fences(i915);
->>>>>>> linux-next/akpm-base
i915_gem_resume(i915);
}
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-slub-fix-a-deadlock-in-show_slab_objects-fix.patch
ocfs2-protect-extent-tree-in-the-ocfs2_prepare_inode_for_write-checkpatch-fixes.patch
mm.patch
mm-pgmap-use-correct-alignment-when-looking-at-first-pfn-from-a-region-checkpatch-fixes.patch
mm-oom-avoid-printk-iteration-under-rcu-fix.patch
hugetlb-remove-duplicated-code-checkpatch-fixes.patch
hugetlb-remove-unused-hstate-in-hugetlb_fault_mutex_hash-fix.patch
diff-sucks.patch
samples-watch_queue-watch_test-fix-build.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
linux-next-git-rejects.patch
