diff for duplicates of <20151212172057.GA7997@cmpxchg.org> diff --git a/a/1.txt b/N1/1.txt index 3dfe4ab..01b158a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,9 +4,9 @@ On Sat, Dec 12, 2015 at 07:33:32PM +0300, Vladimir Davydov wrote: > > controller code is insignificant, having these conditionals is not > > worth the complication and fragility that comes with them. > > -> > Signed-off-by: Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org> +> > Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> > -> Acked-by: Vladimir Davydov <vdavydov-5HdwGun5lf+gSpxsJD1C4w@public.gmane.org> +> Acked-by: Vladimir Davydov <vdavydov@virtuozzo.com> > > > @@ -4374,17 +4342,11 @@ static void mem_cgroup_css_free(struct cgroup_subsys_state *css) > > { @@ -35,29 +35,3 @@ Andrew, could you please pick this up? However, it's important to also then remove the hunk above from THIS patch, the one that deletes the excessive memcg_free_kmem(). We need exactly one memcg_free_kmem() in mem_cgroup_css_free(). :-) - -From 94a14b7b0f7ed5b5ac88ca285a7e8ec3215ea59c Mon Sep 17 00:00:00 2001 -From: Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org> -Date: Sat, 12 Dec 2015 12:14:31 -0500 -Subject: [PATCH] net: drop tcp_memcontrol.c fix - -Signed-off-by: Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org> ---- - mm/memcontrol.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/mm/memcontrol.c b/mm/memcontrol.c -index 5cf7fd2..a4ce8d3 100644 ---- a/mm/memcontrol.c -+++ b/mm/memcontrol.c -@@ -4386,8 +4386,6 @@ static void mem_cgroup_css_free(struct cgroup_subsys_state *css) - static_branch_dec(&memcg_sockets_enabled_key); - #endif - -- memcg_free_kmem(memcg); -- - __mem_cgroup_free(memcg); - } - --- -2.6.4 diff --git a/a/content_digest b/N1/content_digest index 15f2e1f..689a765 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,16 +1,16 @@ "ref\01449863653-6546-1-git-send-email-hannes@cmpxchg.org\0" "ref\01449863653-6546-2-git-send-email-hannes@cmpxchg.org\0" "ref\020151212163332.GC28521@esperanza\0" - "From\0Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org>\0" + "From\0Johannes Weiner <hannes@cmpxchg.org>\0" "Subject\0Re: [PATCH 2/4] mm: memcontrol: reign in the CONFIG space madness\0" "Date\0Sat, 12 Dec 2015 12:20:57 -0500\0" - "To\0Vladimir Davydov <vdavydov-5HdwGun5lf+gSpxsJD1C4w@public.gmane.org>\0" - "Cc\0Andrew Morton <akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>" - Michal Hocko <mhocko-AlSwsSmVLrQ@public.gmane.org> - linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org - cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - " kernel-team-b10kYP2dOMg@public.gmane.org\0" + "To\0Vladimir Davydov <vdavydov@virtuozzo.com>\0" + "Cc\0Andrew Morton <akpm@linux-foundation.org>" + Michal Hocko <mhocko@suse.cz> + linux-mm@kvack.org + cgroups@vger.kernel.org + linux-kernel@vger.kernel.org + " kernel-team@fb.com\0" "\00:1\0" "b\0" "On Sat, Dec 12, 2015 at 07:33:32PM +0300, Vladimir Davydov wrote:\n" @@ -19,9 +19,9 @@ "> > controller code is insignificant, having these conditionals is not\n" "> > worth the complication and fragility that comes with them.\n" "> > \n" - "> > Signed-off-by: Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org>\n" + "> > Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>\n" "> \n" - "> Acked-by: Vladimir Davydov <vdavydov-5HdwGun5lf+gSpxsJD1C4w@public.gmane.org>\n" + "> Acked-by: Vladimir Davydov <vdavydov@virtuozzo.com>\n" "> \n" "> > @@ -4374,17 +4342,11 @@ static void mem_cgroup_css_free(struct cgroup_subsys_state *css)\n" "> > {\n" @@ -49,32 +49,6 @@ "Andrew, could you please pick this up? However, it's important to also\n" "then remove the hunk above from THIS patch, the one that deletes the\n" "excessive memcg_free_kmem(). We need exactly one memcg_free_kmem() in\n" - "mem_cgroup_css_free(). :-)\n" - "\n" - "From 94a14b7b0f7ed5b5ac88ca285a7e8ec3215ea59c Mon Sep 17 00:00:00 2001\n" - "From: Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org>\n" - "Date: Sat, 12 Dec 2015 12:14:31 -0500\n" - "Subject: [PATCH] net: drop tcp_memcontrol.c fix\n" - "\n" - "Signed-off-by: Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org>\n" - "---\n" - " mm/memcontrol.c | 2 --\n" - " 1 file changed, 2 deletions(-)\n" - "\n" - "diff --git a/mm/memcontrol.c b/mm/memcontrol.c\n" - "index 5cf7fd2..a4ce8d3 100644\n" - "--- a/mm/memcontrol.c\n" - "+++ b/mm/memcontrol.c\n" - "@@ -4386,8 +4386,6 @@ static void mem_cgroup_css_free(struct cgroup_subsys_state *css)\n" - " \t\tstatic_branch_dec(&memcg_sockets_enabled_key);\n" - " #endif\n" - " \n" - "-\tmemcg_free_kmem(memcg);\n" - "-\n" - " \t__mem_cgroup_free(memcg);\n" - " }\n" - " \n" - "-- \n" - 2.6.4 + mem_cgroup_css_free(). :-) -b17322c87d49c309130550c600732a9cc7b3462fa9dc1c4445f2341e3420ddd4 +6730f9b14be9dd635b61f7dbb7f456212ff7ab6fd341c95903680744c839d734
diff --git a/a/1.txt b/N2/1.txt index 3dfe4ab..49c5623 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -4,9 +4,9 @@ On Sat, Dec 12, 2015 at 07:33:32PM +0300, Vladimir Davydov wrote: > > controller code is insignificant, having these conditionals is not > > worth the complication and fragility that comes with them. > > -> > Signed-off-by: Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org> +> > Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> > -> Acked-by: Vladimir Davydov <vdavydov-5HdwGun5lf+gSpxsJD1C4w@public.gmane.org> +> Acked-by: Vladimir Davydov <vdavydov@virtuozzo.com> > > > @@ -4374,17 +4342,11 @@ static void mem_cgroup_css_free(struct cgroup_subsys_state *css) > > { @@ -36,12 +36,12 @@ then remove the hunk above from THIS patch, the one that deletes the excessive memcg_free_kmem(). We need exactly one memcg_free_kmem() in mem_cgroup_css_free(). :-) -From 94a14b7b0f7ed5b5ac88ca285a7e8ec3215ea59c Mon Sep 17 00:00:00 2001 -From: Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org> +>From 94a14b7b0f7ed5b5ac88ca285a7e8ec3215ea59c Mon Sep 17 00:00:00 2001 +From: Johannes Weiner <hannes@cmpxchg.org> Date: Sat, 12 Dec 2015 12:14:31 -0500 Subject: [PATCH] net: drop tcp_memcontrol.c fix -Signed-off-by: Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org> +Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> --- mm/memcontrol.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/a/content_digest b/N2/content_digest index 15f2e1f..63d8682 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,16 +1,16 @@ "ref\01449863653-6546-1-git-send-email-hannes@cmpxchg.org\0" "ref\01449863653-6546-2-git-send-email-hannes@cmpxchg.org\0" "ref\020151212163332.GC28521@esperanza\0" - "From\0Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org>\0" + "From\0Johannes Weiner <hannes@cmpxchg.org>\0" "Subject\0Re: [PATCH 2/4] mm: memcontrol: reign in the CONFIG space madness\0" "Date\0Sat, 12 Dec 2015 12:20:57 -0500\0" - "To\0Vladimir Davydov <vdavydov-5HdwGun5lf+gSpxsJD1C4w@public.gmane.org>\0" - "Cc\0Andrew Morton <akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>" - Michal Hocko <mhocko-AlSwsSmVLrQ@public.gmane.org> - linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org - cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - " kernel-team-b10kYP2dOMg@public.gmane.org\0" + "To\0Vladimir Davydov <vdavydov@virtuozzo.com>\0" + "Cc\0Andrew Morton <akpm@linux-foundation.org>" + Michal Hocko <mhocko@suse.cz> + linux-mm@kvack.org + cgroups@vger.kernel.org + linux-kernel@vger.kernel.org + " kernel-team@fb.com\0" "\00:1\0" "b\0" "On Sat, Dec 12, 2015 at 07:33:32PM +0300, Vladimir Davydov wrote:\n" @@ -19,9 +19,9 @@ "> > controller code is insignificant, having these conditionals is not\n" "> > worth the complication and fragility that comes with them.\n" "> > \n" - "> > Signed-off-by: Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org>\n" + "> > Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>\n" "> \n" - "> Acked-by: Vladimir Davydov <vdavydov-5HdwGun5lf+gSpxsJD1C4w@public.gmane.org>\n" + "> Acked-by: Vladimir Davydov <vdavydov@virtuozzo.com>\n" "> \n" "> > @@ -4374,17 +4342,11 @@ static void mem_cgroup_css_free(struct cgroup_subsys_state *css)\n" "> > {\n" @@ -51,12 +51,12 @@ "excessive memcg_free_kmem(). We need exactly one memcg_free_kmem() in\n" "mem_cgroup_css_free(). :-)\n" "\n" - "From 94a14b7b0f7ed5b5ac88ca285a7e8ec3215ea59c Mon Sep 17 00:00:00 2001\n" - "From: Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org>\n" + ">From 94a14b7b0f7ed5b5ac88ca285a7e8ec3215ea59c Mon Sep 17 00:00:00 2001\n" + "From: Johannes Weiner <hannes@cmpxchg.org>\n" "Date: Sat, 12 Dec 2015 12:14:31 -0500\n" "Subject: [PATCH] net: drop tcp_memcontrol.c fix\n" "\n" - "Signed-off-by: Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org>\n" + "Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>\n" "---\n" " mm/memcontrol.c | 2 --\n" " 1 file changed, 2 deletions(-)\n" @@ -77,4 +77,4 @@ "-- \n" 2.6.4 -b17322c87d49c309130550c600732a9cc7b3462fa9dc1c4445f2341e3420ddd4 +76069b186c8aad9f7d72e5c7fef945401553a5cacee8fb7da8e1afbb85c4f6d2
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.