diff for duplicates of <20160121205628.GA14909@cmpxchg.org> diff --git a/a/1.txt b/N1/1.txt index 27bc168..6bbd439 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,3 +11,45 @@ Thanks for the headsup, that hasn't made it into my copy of checkpatch.pl yet. Here is the updated patch: + +>From ac0fd0c5f31cdc73c52fd86f40af419c1871fbcf Mon Sep 17 00:00:00 2001 +From: Johannes Weiner <hannes@cmpxchg.org> +Date: Thu, 21 Jan 2016 13:34:47 -0500 +Subject: [PATCH] net: sock: remove dead cgroup methods from struct proto + +The cgroup methods are no longer used after baac50bbc3cd ("net: +tcp_memcontrol: simplify linkage between socket and page counter"). +The hunk to delete them was included in the original patch but must +have gotten lost during conflict resolution on the way upstream. + +Fixes: baac50bbc3cd ("net: tcp_memcontrol: simplify linkage between socket and page counter") +Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> +--- + include/net/sock.h | 12 ------------ + 1 file changed, 12 deletions(-) + +diff --git a/include/net/sock.h b/include/net/sock.h +index b9e7b3d863a0..f5ea148853e2 100644 +--- a/include/net/sock.h ++++ b/include/net/sock.h +@@ -1036,18 +1036,6 @@ struct proto { + #ifdef SOCK_REFCNT_DEBUG + atomic_t socks; + #endif +-#ifdef CONFIG_MEMCG_KMEM +- /* +- * cgroup specific init/deinit functions. Called once for all +- * protocols that implement it, from cgroups populate function. +- * This function has to setup any files the protocol want to +- * appear in the kmem cgroup filesystem. +- */ +- int (*init_cgroup)(struct mem_cgroup *memcg, +- struct cgroup_subsys *ss); +- void (*destroy_cgroup)(struct mem_cgroup *memcg); +- struct cg_proto *(*proto_cgroup)(struct mem_cgroup *memcg); +-#endif + int (*diag_destroy)(struct sock *sk, int err); + }; + +-- +2.7.0 diff --git a/a/content_digest b/N1/content_digest index 914b405..a095aac 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -22,6 +22,48 @@ "Thanks for the headsup, that hasn't made it into my copy of\n" "checkpatch.pl yet.\n" "\n" - Here is the updated patch: + "Here is the updated patch:\n" + "\n" + ">From ac0fd0c5f31cdc73c52fd86f40af419c1871fbcf Mon Sep 17 00:00:00 2001\n" + "From: Johannes Weiner <hannes@cmpxchg.org>\n" + "Date: Thu, 21 Jan 2016 13:34:47 -0500\n" + "Subject: [PATCH] net: sock: remove dead cgroup methods from struct proto\n" + "\n" + "The cgroup methods are no longer used after baac50bbc3cd (\"net:\n" + "tcp_memcontrol: simplify linkage between socket and page counter\").\n" + "The hunk to delete them was included in the original patch but must\n" + "have gotten lost during conflict resolution on the way upstream.\n" + "\n" + "Fixes: baac50bbc3cd (\"net: tcp_memcontrol: simplify linkage between socket and page counter\")\n" + "Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>\n" + "---\n" + " include/net/sock.h | 12 ------------\n" + " 1 file changed, 12 deletions(-)\n" + "\n" + "diff --git a/include/net/sock.h b/include/net/sock.h\n" + "index b9e7b3d863a0..f5ea148853e2 100644\n" + "--- a/include/net/sock.h\n" + "+++ b/include/net/sock.h\n" + "@@ -1036,18 +1036,6 @@ struct proto {\n" + " #ifdef SOCK_REFCNT_DEBUG\n" + " \tatomic_t\t\tsocks;\n" + " #endif\n" + "-#ifdef CONFIG_MEMCG_KMEM\n" + "-\t/*\n" + "-\t * cgroup specific init/deinit functions. Called once for all\n" + "-\t * protocols that implement it, from cgroups populate function.\n" + "-\t * This function has to setup any files the protocol want to\n" + "-\t * appear in the kmem cgroup filesystem.\n" + "-\t */\n" + "-\tint\t\t\t(*init_cgroup)(struct mem_cgroup *memcg,\n" + "-\t\t\t\t\t struct cgroup_subsys *ss);\n" + "-\tvoid\t\t\t(*destroy_cgroup)(struct mem_cgroup *memcg);\n" + "-\tstruct cg_proto\t\t*(*proto_cgroup)(struct mem_cgroup *memcg);\n" + "-#endif\n" + " \tint\t\t\t(*diag_destroy)(struct sock *sk, int err);\n" + " };\n" + " \n" + "-- \n" + 2.7.0 -f34c5a765137ebee7674e78561819e5594d96911b344f23a2b44dc8705e32e5d +a8355f304df188550d94e425844d546b7a08e7e4bac98502c8bbe272aec818e0
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.