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/nouveau/nouveau_svm.c | 16 ----------------
1 file changed, 16 deletions(-)
--- a/drivers/gpu/drm/nouveau/nouveau_svm.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/nouveau/nouveau_svm.c
@@ -496,26 +496,11 @@ nouveau_range_fault(struct hmm_mirror *m
range->start, range->end,
PAGE_SHIFT);
if (ret) {
-<<<<<<< HEAD
- up_read(&range->vma->vm_mm->mmap_sem);
-=======
up_read(&range->hmm->mm->mmap_sem);
->>>>>>> linux-next/akpm-base
return (int)ret;
}
if (!hmm_range_wait_until_valid(range, HMM_RANGE_DEFAULT_TIMEOUT)) {
-<<<<<<< HEAD
- up_read(&range->vma->vm_mm->mmap_sem);
- return -EAGAIN;
- }
-
- ret = hmm_range_fault(range, true);
- if (ret <= 0) {
- if (ret == 0)
- ret = -EBUSY;
- up_read(&range->vma->vm_mm->mmap_sem);
-=======
up_read(&range->hmm->mm->mmap_sem);
return -EBUSY;
}
@@ -525,7 +510,6 @@ nouveau_range_fault(struct hmm_mirror *m
if (ret == 0)
ret = -EBUSY;
up_read(&range->hmm->mm->mmap_sem);
->>>>>>> linux-next/akpm-base
hmm_range_unregister(range);
return ret;
}
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
asm-generic-fix-wtype-limits-compiler-warnings-fix.patch
ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch
mm.patch
mm-introduce-page_shift-fix.patch
mm-throttle-allocators-when-failing-reclaim-over-memoryhigh-fix.patch
mm-throttle-allocators-when-failing-reclaim-over-memoryhigh-fix-fix.patch
mm-throttle-allocators-when-failing-reclaim-over-memoryhigh-fix-fix-fix.patch
mm-memory_hotplug-remove-move_pfn_range-fix.patch
mm-compaction-clear-total_migratefree_scanned-before-scanning-a-new-zone-fix-fix.patch
mm-compaction-clear-total_migratefree_scanned-before-scanning-a-new-zone-fix-2-fix.patch
mm-oom-avoid-printk-iteration-under-rcu-fix.patch
mm-oom_killer-add-task-uid-to-info-message-on-an-oom-kill-fix.patch
psi-annotate-refault-stalls-from-io-submission-fix.patch
psi-annotate-refault-stalls-from-io-submission-fix-2.patch
linux-next-rejects.patch
diff-sucks.patch
fs-kernfs-dirc-kernfs_path_from_node_locked-remove-unneeded-test.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
linux-next-git-rejects.patch
