The patch titled Subject: memcg: replace cgroup_lock with memcg specific memcg_lock fix has been removed from the -mm tree. Its filename was memcg-replace-cgroup_lock-with-memcg-specific-memcg_lock-fix.patch This patch was dropped because it was folded into memcg-replace-cgroup_lock-with-memcg-specific-memcg_lock.patch ------------------------------------------------------ From: Glauber Costa <glommer@xxxxxxxxxxxxx> Subject: memcg: replace cgroup_lock with memcg specific memcg_lock fix Signed-off-by: Glauber Costa <glommer@xxxxxxxxxxxxx> Reported-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx> Acked-by: Michal Hocko <mhocko@xxxxxxx> Cc: Tejun Heo <tj@xxxxxxxxxx> Cc: Hiroyuki Kamezawa <kamezawa.hiroyuki@xxxxxxxxx> Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memcontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN mm/memcontrol.c~memcg-replace-cgroup_lock-with-memcg-specific-memcg_lock-fix mm/memcontrol.c --- a/mm/memcontrol.c~memcg-replace-cgroup_lock-with-memcg-specific-memcg_lock-fix +++ a/mm/memcontrol.c @@ -5736,7 +5736,7 @@ static int mem_cgroup_oom_control_write( mutex_lock(&memcg_create_mutex); /* oom-kill-disable is a flag for subhierarchy. */ if ((parent->use_hierarchy) || memcg_has_children(memcg)) { - cgroup_unlock(); + mutex_unlock(&memcg_create_mutex); return -EINVAL; } memcg->oom_kill_disable = val; _ Patches currently in -mm which might be from glommer@xxxxxxxxxxxxx are memcgvmscan-do-not-break-out-targeted-reclaim-without-reclaimed-pages.patch memcg-reduce-the-size-of-struct-memcg-244-fold.patch memcg-prevent-changes-to-move_charge_at_immigrate-during-task-attach.patch memcg-split-part-of-memcg-creation-to-css_online.patch memcg-fast-hierarchy-aware-child-test.patch memcg-replace-cgroup_lock-with-memcg-specific-memcg_lock.patch memcg-increment-static-branch-right-after-limit-set.patch memcg-avoid-dangling-reference-count-in-creation-failure.patch memcg-stop-warning-on-memcg_propagate_kmem.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html