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>
---
kernel/cgroup/cgroup.c | 39 ---------------------------------------
1 file changed, 39 deletions(-)
--- a/kernel/cgroup/cgroup.c~linux-next-git-rejects
+++ a/kernel/cgroup/cgroup.c
@@ -4412,31 +4412,12 @@ static void css_task_iter_advance_css_se
it->cur_tasks_head = &cset->dying_tasks;
break;
}
-<<<<<<< HEAD
- } while (!css_set_populated(cset) && list_empty(&cset->dying_tasks));
-
- if (!list_empty(&cset->tasks)) {
- it->task_pos = cset->tasks.next;
- it->cur_tasks_head = &cset->tasks;
- } else if (!list_empty(&cset->mg_tasks)) {
- it->task_pos = cset->mg_tasks.next;
- it->cur_tasks_head = &cset->mg_tasks;
- } else {
- it->task_pos = cset->dying_tasks.next;
- it->cur_tasks_head = &cset->dying_tasks;
- }
-
- it->tasks_head = &cset->tasks;
- it->mg_tasks_head = &cset->mg_tasks;
- it->dying_tasks_head = &cset->dying_tasks;
-=======
}
if (!cset) {
it->task_pos = NULL;
return;
}
it->task_pos = it->cur_tasks_head->next;
->>>>>>> linux-next/akpm-base
/*
* We don't keep css_sets locked across iteration steps and thus
@@ -4490,17 +4471,6 @@ repeat:
else
it->task_pos = it->task_pos->next;
-<<<<<<< HEAD
- if (it->task_pos == it->tasks_head) {
- it->task_pos = it->mg_tasks_head->next;
- it->cur_tasks_head = it->mg_tasks_head;
- }
- if (it->task_pos == it->mg_tasks_head) {
- it->task_pos = it->dying_tasks_head->next;
- it->cur_tasks_head = it->dying_tasks_head;
- }
- if (it->task_pos == it->dying_tasks_head)
-=======
if (it->task_pos == &it->cur_cset->tasks) {
it->cur_tasks_head = &it->cur_cset->mg_tasks;
it->task_pos = it->cur_tasks_head->next;
@@ -4510,7 +4480,6 @@ repeat:
it->task_pos = it->cur_tasks_head->next;
}
if (it->task_pos == &it->cur_cset->dying_tasks)
->>>>>>> linux-next/akpm-base
css_task_iter_advance_css_set(it);
} else {
/* called from start, proceed to the first cset */
@@ -4528,20 +4497,12 @@ repeat:
goto repeat;
/* and dying leaders w/o live member threads */
-<<<<<<< HEAD
- if (it->cur_tasks_head == it->dying_tasks_head &&
-=======
if (it->cur_tasks_head == &it->cur_cset->dying_tasks &&
->>>>>>> linux-next/akpm-base
!atomic_read(&task->signal->live))
goto repeat;
} else {
/* skip all dying ones */
-<<<<<<< HEAD
- if (it->cur_tasks_head == it->dying_tasks_head)
-=======
if (it->cur_tasks_head == &it->cur_cset->dying_tasks)
->>>>>>> linux-next/akpm-base
goto repeat;
}
}
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-hotplug-fix-hot-remove-failure-in-sparsememvmemmap-case-fix.patch
mm.patch
memcg-optimize-memorynuma_stat-like-memorystat-fix.patch
selftest-add-mremap_dontunmap-selftest-fix.patch
selftest-add-mremap_dontunmap-selftest-v7-checkpatch-fixes.patch
hugetlb_cgroup-add-reservation-accounting-for-private-mappings-fix.patch
hugetlb_cgroup-add-accounting-for-shared-mappings-fix.patch
mm-migratec-migrate-pg_readahead-flag-fix.patch
proc-faster-open-read-close-with-permanent-files-checkpatch-fixes.patch
linux-next-rejects.patch
linux-next-fix.patch
mm-add-vm_insert_pages-fix.patch
net-zerocopy-use-vm_insert_pages-for-tcp-rcv-zerocopy-fix.patch
seq_read-info-message-about-buggy-next-functions-fix.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
linux-next-git-rejects.patch
