The patch titled
Subject: linux-next-git-rejects
has been removed from the -mm tree. Its filename was
linux-next-git-rejects.patch
This patch was dropped because it is obsolete
------------------------------------------------------
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 | 12 ------------
drivers/gpu/drm/i915/gt/intel_lrc.c | 16 ----------------
drivers/gpu/drm/panfrost/panfrost_job.c | 10 ----------
3 files changed, 38 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
@@ -355,18 +355,6 @@ err:
* already did the job.
*/
return VM_FAULT_NOPAGE;
-<<<<<<< HEAD
- case -ENOMEM:
- return VM_FAULT_OOM;
- case -ENOSPC:
- case -EFAULT:
- case -ENODEV: /* bad object, how did you get here! */
- return VM_FAULT_SIGBUS;
- default:
- WARN_ONCE(ret, "unhandled error in %s: %i\n", __func__, ret);
- return VM_FAULT_SIGBUS;
-=======
->>>>>>> linux-next/akpm-base
}
}
--- a/drivers/gpu/drm/i915/gt/intel_lrc.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/gt/intel_lrc.c
@@ -4103,7 +4103,6 @@ static void virtual_submit_request(struc
__i915_request_submit(old);
i915_request_put(old);
}
-<<<<<<< HEAD
if (i915_request_completed(rq)) {
__i915_request_submit(rq);
@@ -4117,21 +4116,6 @@ static void virtual_submit_request(struc
GEM_BUG_ON(!list_empty(virtual_queue(ve)));
list_move_tail(&rq->sched.link, virtual_queue(ve));
-=======
-
- if (i915_request_completed(rq)) {
- __i915_request_submit(rq);
-
- ve->base.execlists.queue_priority_hint = INT_MIN;
- ve->request = NULL;
- } else {
- ve->base.execlists.queue_priority_hint = rq_prio(rq);
- ve->request = i915_request_get(rq);
-
- GEM_BUG_ON(!list_empty(virtual_queue(ve)));
- list_move_tail(&rq->sched.link, virtual_queue(ve));
-
->>>>>>> linux-next/akpm-base
tasklet_schedule(&ve->base.execlists.tasklet);
}
--- a/drivers/gpu/drm/panfrost/panfrost_job.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/panfrost/panfrost_job.c
@@ -386,7 +386,6 @@ static void panfrost_job_timedout(struct
for (i = 0; i < NUM_JOB_SLOTS; i++) {
struct drm_gpu_scheduler *sched = &pfdev->js->queue[i].sched;
-<<<<<<< HEAD
drm_sched_stop(sched, sched_job);
if (js != i)
@@ -394,15 +393,6 @@ static void panfrost_job_timedout(struct
cancel_delayed_work_sync(&sched->work_tdr);
}
-=======
-
- drm_sched_stop(sched, sched_job);
- if (js != i)
- /* Ensure any timeouts on other slots have finished */
- cancel_delayed_work_sync(&sched->work_tdr);
- }
-
->>>>>>> linux-next/akpm-base
drm_sched_increase_karma(sched_job);
spin_lock_irqsave(&pfdev->js->job_lock, flags);
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
ocfs2-protect-extent-tree-in-the-ocfs2_prepare_inode_for_write-checkpatch-fixes.patch
mm.patch
mm-swap-disallow-swapon-on-zoned-block-devices-fix.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
mm-annotate-refault-stalls-from-swap_readpage-fix.patch
diff-sucks.patch
drivers-block-null_blk_mainc-fix-layout.patch
drivers-block-null_blk_mainc-fix-uninitialized-var-warnings.patch
bitops-introduce-the-for_each_set_clump8-macro-fix-fix.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
