[folded-merged] mm-oom-cgroup-aware-oom-killer-fix-3.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: mm: revert mem_cgroup_put() introduction
has been removed from the -mm tree.  Its filename was
     mm-oom-cgroup-aware-oom-killer-fix-3.patch

This patch was dropped because it was folded into mm-oom-cgroup-aware-oom-killer.patch

------------------------------------------------------
From: Roman Gushchin <guro@xxxxxx>
Subject: mm: revert mem_cgroup_put() introduction

This patch should be folded into "mm, oom: cgroup-aware OOM killer".

Link: http://lkml.kernel.org/r/20180623000600.5818-1-guro@xxxxxx
Signed-off-by: Roman Gushchin <guro@xxxxxx>
Cc: Shakeel Butt <shakeelb@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 include/linux/memcontrol.h |    9 ---------
 1 file changed, 9 deletions(-)

--- a/include/linux/memcontrol.h~mm-oom-cgroup-aware-oom-killer-fix-3
+++ a/include/linux/memcontrol.h
@@ -403,11 +403,6 @@ static inline void mem_cgroup_put(struct
 		css_put(&memcg->css);
 }
 
-static inline void mem_cgroup_put(struct mem_cgroup *memcg)
-{
-	css_put(&memcg->css);
-}
-
 #define mem_cgroup_from_counter(counter, member)	\
 	container_of(counter, struct mem_cgroup, member)
 
@@ -888,10 +883,6 @@ static inline struct mem_cgroup *get_mem
 }
 
 static inline void mem_cgroup_put(struct mem_cgroup *memcg)
-{
-}
-
-static inline void mem_cgroup_put(struct mem_cgroup *memcg)
 {
 }
 
_

Patches currently in -mm which might be from guro@xxxxxx are

mm-introduce-mem_cgroup_put-helper.patch
mm-oom-refactor-the-oom_kill_process-function.patch
mm-implement-mem_cgroup_scan_tasks-for-the-root-memory-cgroup.patch
mm-oom-cgroup-aware-oom-killer.patch
mm-oom-introduce-memoryoom_group.patch
mm-oom-introduce-memoryoom_group-fix.patch
mm-oom-add-cgroup-v2-mount-option-for-cgroup-aware-oom-killer.patch
mm-oom-docs-describe-the-cgroup-aware-oom-killer.patch
mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix.patch
cgroup-list-groupoom-in-cgroup-features.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



[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux