diff for duplicates of <4D802AC7.8040801@cn.fujitsu.com>

diff --git a/a/1.txt b/N1/1.txt
index afc173a..e2d7c6c 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,36 +1,23 @@
-On 03/15/2011 07:04 PM, Eric Dumazet wrote:
-> Le mardi 15 mars 2011 à 18:11 +0800, Lai Jiangshan a écrit :
->>
->> There is no callback of this module maybe queued
->> since we use kfree_rcu(), we can safely remove the rcu_barrier().
->>
->> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
->> ---
->>  net/sched/act_police.c |    1 -
->>  1 files changed, 0 insertions(+), 1 deletions(-)
->>
->> diff --git a/net/sched/act_police.c b/net/sched/act_police.c
->> index 083b091..22e3f9b 100644
->> --- a/net/sched/act_police.c
->> +++ b/net/sched/act_police.c
->> @@ -397,7 +397,6 @@ static void __exit
->>  police_cleanup_module(void)
->>  {
->>  	tcf_unregister_action(&act_police_ops);
->> -	rcu_barrier(); /* Wait for completion of call_rcu()'s (tcf_police_free_rcu) */
->>  }
->>  
->>  module_init(police_init_module);
-> 
-> 
-> Why is it a separate patch, and not included in patch 5/17 ?
-> 
-
-A simple_kfree_callback() a patch, if a module has multiple simple_kfree_callback()s,
-"rcu_barrier()" in module_exit function should only be removed after all
-callback()s are converted to kfree_rcu(). Separate patches makes things
-clearer.
-_______________________________________________
-Containers mailing list
-Containers@lists.linux-foundation.org
-https://lists.linux-foundation.org/mailman/listinfo/containers
+T24gMDMvMTUvMjAxMSAwNzowNCBQTSwgRXJpYyBEdW1hemV0IHdyb3RlOgo+IExlIG1hcmRpIDE1
+IG1hcnMgMjAxMSDDoCAxODoxMSArMDgwMCwgTGFpIEppYW5nc2hhbiBhIMOpY3JpdCA6Cj4+Cj4+
+IFRoZXJlIGlzIG5vIGNhbGxiYWNrIG9mIHRoaXMgbW9kdWxlIG1heWJlIHF1ZXVlZAo+PiBzaW5j
+ZSB3ZSB1c2Uga2ZyZWVfcmN1KCksIHdlIGNhbiBzYWZlbHkgcmVtb3ZlIHRoZSByY3VfYmFycmll
+cigpLgo+Pgo+PiBTaWduZWQtb2ZmLWJ5OiBMYWkgSmlhbmdzaGFuIDxsYWlqc0Bjbi5mdWppdHN1
+LmNvbT4KPj4gLS0tCj4+ICBuZXQvc2NoZWQvYWN0X3BvbGljZS5jIHwgICAgMSAtCj4+ICAxIGZp
+bGVzIGNoYW5nZWQsIDAgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbnMoLSkKPj4KPj4gZGlmZiAt
+LWdpdCBhL25ldC9zY2hlZC9hY3RfcG9saWNlLmMgYi9uZXQvc2NoZWQvYWN0X3BvbGljZS5jCj4+
+IGluZGV4IDA4M2IwOTEuLjIyZTNmOWIgMTAwNjQ0Cj4+IC0tLSBhL25ldC9zY2hlZC9hY3RfcG9s
+aWNlLmMKPj4gKysrIGIvbmV0L3NjaGVkL2FjdF9wb2xpY2UuYwo+PiBAQCAtMzk3LDcgKzM5Nyw2
+IEBAIHN0YXRpYyB2b2lkIF9fZXhpdAo+PiAgcG9saWNlX2NsZWFudXBfbW9kdWxlKHZvaWQpCj4+
+ICB7Cj4+ICAJdGNmX3VucmVnaXN0ZXJfYWN0aW9uKCZhY3RfcG9saWNlX29wcyk7Cj4+IC0JcmN1
+X2JhcnJpZXIoKTsgLyogV2FpdCBmb3IgY29tcGxldGlvbiBvZiBjYWxsX3JjdSgpJ3MgKHRjZl9w
+b2xpY2VfZnJlZV9yY3UpICovCj4+ICB9Cj4+ICAKPj4gIG1vZHVsZV9pbml0KHBvbGljZV9pbml0
+X21vZHVsZSk7Cj4gCj4gCj4gV2h5IGlzIGl0IGEgc2VwYXJhdGUgcGF0Y2gsIGFuZCBub3QgaW5j
+bHVkZWQgaW4gcGF0Y2ggNS8xNyA/Cj4gCgpBIHNpbXBsZV9rZnJlZV9jYWxsYmFjaygpIGEgcGF0
+Y2gsIGlmIGEgbW9kdWxlIGhhcyBtdWx0aXBsZSBzaW1wbGVfa2ZyZWVfY2FsbGJhY2soKXMsCiJy
+Y3VfYmFycmllcigpIiBpbiBtb2R1bGVfZXhpdCBmdW5jdGlvbiBzaG91bGQgb25seSBiZSByZW1v
+dmVkIGFmdGVyIGFsbApjYWxsYmFjaygpcyBhcmUgY29udmVydGVkIHRvIGtmcmVlX3JjdSgpLiBT
+ZXBhcmF0ZSBwYXRjaGVzIG1ha2VzIHRoaW5ncwpjbGVhcmVyLgpfX19fX19fX19fX19fX19fX19f
+X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpDb250YWluZXJzIG1haWxpbmcgbGlzdApDb250
+YWluZXJzQGxpc3RzLmxpbnV4LWZvdW5kYXRpb24ub3JnCmh0dHBzOi8vbGlzdHMubGludXgtZm91
+bmRhdGlvbi5vcmcvbWFpbG1hbi9saXN0aW5mby9jb250YWluZXJz
diff --git a/a/content_digest b/N1/content_digest
index f413c5a..5e88470 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,66 +1,53 @@
  "ref\04D7F3610.6000809@cn.fujitsu.com\0"
  "ref\04D7F3B62.6000005@cn.fujitsu.com\0"
  "ref\01300187052.10062.12.camel@edumazet-laptop\0"
- "From\0Lai Jiangshan <laijs-BthXqXjhjHXQFUHtdCDX3A@public.gmane.org>\0"
+ "From\0Lai Jiangshan <laijs@cn.fujitsu.com>\0"
  "Subject\0Re: [PATCH 17/17] net,act_police,rcu: remove rcu_barrier()\0"
  "Date\0Wed, 16 Mar 2011 11:13:11 +0800\0"
- "To\0Eric Dumazet <eric.dumazet-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0"
- "Cc\0Randy Dunlap <randy.dunlap-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>"
-  linux-decnet-user-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
-  Trond Myklebust <Trond.Myklebust-HgOvQuBEEgTQT0dZR+AlfA@public.gmane.org>
-  linux-sctp-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-  Pavel Emelyanov <xemul-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>
-  Pekka Savola (ipv6) <pekkas-UjJjq++bwZ7HOG6cAo2yLw@public.gmane.org>
- " Uwe Kleine-K\303\266nig <u.kleine-koenig-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>"
-  Alexey Kuznetsov <kuznet-v/Mj1YrvjDBInbfyfbPRSQ@public.gmane.org>
-  Ingo Molnar <mingo-X9Un+BFzKDI@public.gmane.org>
-  Paul E. McKenney <paulmck-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
-  Sridhar Samudrala <sri-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
-  Vlad Yasevich <vladislav.yasevich-VXdhtT5mjnY@public.gmane.org>
+ "To\0Eric Dumazet <eric.dumazet@gmail.com>\0"
+ "Cc\0Randy Dunlap <randy.dunlap@oracle.com>"
+  linux-decnet-user@lists.sourceforge.net
+  Trond Myklebust <Trond.Myklebust@netapp.com>
+  linux-sctp@vger.kernel.org
+  Pavel Emelyanov <xemul@openvz.org>
+  Pekka Savola (ipv6) <pekkas@netcore.fi>
+ " Uwe Kleine-K\303\266nig <u.kleine-koenig@pengutronix.de>"
+  Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
+  Ingo Molnar <mingo@elte.hu>
+  Paul E. McKenney <paulmck@linux.vnet.ibm.com>
+  Sridhar Samudrala <sri@us.ibm.com>
+  Vlad Yasevich <vladislav.yasevich@hp.com>
   Hagen Paul Pfeifer <hagen-GvnIQ6b/HdU@public.gmane.org>
   John W. Linville <linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
-  Al Viro <viro-RmSDqhL/yNMiFSDQTTA3OLVCufUGDwFn@public.gmane.org>
-  Johannes Berg <johannes-cdvu00un1VgdHxzADdlk8Q@public.gmane.org>
-  Jens Axboe <axboe-tSWWG44O7X1aa/9Udqfwiw@public.gmane.org>
-  linux-nfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
- " Jiri Pirko <jpirko-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\0"
+  Al Viro <viro@zeniv.linux.org.uk>
+  Johannes Berg <johannes@sipsolutions.net>
+  Jens Axboe <axboe@kernel.dk>
+  linux-nfs@vger.kernel.org
+ " Jiri Pirko <jpirko@redhat.com>\0"
  "\00:1\0"
  "b\0"
- "On 03/15/2011 07:04 PM, Eric Dumazet wrote:\n"
- "> Le mardi 15 mars 2011 \303\240 18:11 +0800, Lai Jiangshan a \303\251crit :\n"
- ">>\n"
- ">> There is no callback of this module maybe queued\n"
- ">> since we use kfree_rcu(), we can safely remove the rcu_barrier().\n"
- ">>\n"
- ">> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>\n"
- ">> ---\n"
- ">>  net/sched/act_police.c |    1 -\n"
- ">>  1 files changed, 0 insertions(+), 1 deletions(-)\n"
- ">>\n"
- ">> diff --git a/net/sched/act_police.c b/net/sched/act_police.c\n"
- ">> index 083b091..22e3f9b 100644\n"
- ">> --- a/net/sched/act_police.c\n"
- ">> +++ b/net/sched/act_police.c\n"
- ">> @@ -397,7 +397,6 @@ static void __exit\n"
- ">>  police_cleanup_module(void)\n"
- ">>  {\n"
- ">>  \ttcf_unregister_action(&act_police_ops);\n"
- ">> -\trcu_barrier(); /* Wait for completion of call_rcu()'s (tcf_police_free_rcu) */\n"
- ">>  }\n"
- ">>  \n"
- ">>  module_init(police_init_module);\n"
- "> \n"
- "> \n"
- "> Why is it a separate patch, and not included in patch 5/17 ?\n"
- "> \n"
- "\n"
- "A simple_kfree_callback() a patch, if a module has multiple simple_kfree_callback()s,\n"
- "\"rcu_barrier()\" in module_exit function should only be removed after all\n"
- "callback()s are converted to kfree_rcu(). Separate patches makes things\n"
- "clearer.\n"
- "_______________________________________________\n"
- "Containers mailing list\n"
- "Containers@lists.linux-foundation.org\n"
- https://lists.linux-foundation.org/mailman/listinfo/containers
+ "T24gMDMvMTUvMjAxMSAwNzowNCBQTSwgRXJpYyBEdW1hemV0IHdyb3RlOgo+IExlIG1hcmRpIDE1\n"
+ "IG1hcnMgMjAxMSDDoCAxODoxMSArMDgwMCwgTGFpIEppYW5nc2hhbiBhIMOpY3JpdCA6Cj4+Cj4+\n"
+ "IFRoZXJlIGlzIG5vIGNhbGxiYWNrIG9mIHRoaXMgbW9kdWxlIG1heWJlIHF1ZXVlZAo+PiBzaW5j\n"
+ "ZSB3ZSB1c2Uga2ZyZWVfcmN1KCksIHdlIGNhbiBzYWZlbHkgcmVtb3ZlIHRoZSByY3VfYmFycmll\n"
+ "cigpLgo+Pgo+PiBTaWduZWQtb2ZmLWJ5OiBMYWkgSmlhbmdzaGFuIDxsYWlqc0Bjbi5mdWppdHN1\n"
+ "LmNvbT4KPj4gLS0tCj4+ICBuZXQvc2NoZWQvYWN0X3BvbGljZS5jIHwgICAgMSAtCj4+ICAxIGZp\n"
+ "bGVzIGNoYW5nZWQsIDAgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbnMoLSkKPj4KPj4gZGlmZiAt\n"
+ "LWdpdCBhL25ldC9zY2hlZC9hY3RfcG9saWNlLmMgYi9uZXQvc2NoZWQvYWN0X3BvbGljZS5jCj4+\n"
+ "IGluZGV4IDA4M2IwOTEuLjIyZTNmOWIgMTAwNjQ0Cj4+IC0tLSBhL25ldC9zY2hlZC9hY3RfcG9s\n"
+ "aWNlLmMKPj4gKysrIGIvbmV0L3NjaGVkL2FjdF9wb2xpY2UuYwo+PiBAQCAtMzk3LDcgKzM5Nyw2\n"
+ "IEBAIHN0YXRpYyB2b2lkIF9fZXhpdAo+PiAgcG9saWNlX2NsZWFudXBfbW9kdWxlKHZvaWQpCj4+\n"
+ "ICB7Cj4+ICAJdGNmX3VucmVnaXN0ZXJfYWN0aW9uKCZhY3RfcG9saWNlX29wcyk7Cj4+IC0JcmN1\n"
+ "X2JhcnJpZXIoKTsgLyogV2FpdCBmb3IgY29tcGxldGlvbiBvZiBjYWxsX3JjdSgpJ3MgKHRjZl9w\n"
+ "b2xpY2VfZnJlZV9yY3UpICovCj4+ICB9Cj4+ICAKPj4gIG1vZHVsZV9pbml0KHBvbGljZV9pbml0\n"
+ "X21vZHVsZSk7Cj4gCj4gCj4gV2h5IGlzIGl0IGEgc2VwYXJhdGUgcGF0Y2gsIGFuZCBub3QgaW5j\n"
+ "bHVkZWQgaW4gcGF0Y2ggNS8xNyA/Cj4gCgpBIHNpbXBsZV9rZnJlZV9jYWxsYmFjaygpIGEgcGF0\n"
+ "Y2gsIGlmIGEgbW9kdWxlIGhhcyBtdWx0aXBsZSBzaW1wbGVfa2ZyZWVfY2FsbGJhY2soKXMsCiJy\n"
+ "Y3VfYmFycmllcigpIiBpbiBtb2R1bGVfZXhpdCBmdW5jdGlvbiBzaG91bGQgb25seSBiZSByZW1v\n"
+ "dmVkIGFmdGVyIGFsbApjYWxsYmFjaygpcyBhcmUgY29udmVydGVkIHRvIGtmcmVlX3JjdSgpLiBT\n"
+ "ZXBhcmF0ZSBwYXRjaGVzIG1ha2VzIHRoaW5ncwpjbGVhcmVyLgpfX19fX19fX19fX19fX19fX19f\n"
+ "X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpDb250YWluZXJzIG1haWxpbmcgbGlzdApDb250\n"
+ "YWluZXJzQGxpc3RzLmxpbnV4LWZvdW5kYXRpb24ub3JnCmh0dHBzOi8vbGlzdHMubGludXgtZm91\n"
+ bmRhdGlvbi5vcmcvbWFpbG1hbi9saXN0aW5mby9jb250YWluZXJz
 
-4a2bbf602383e8059d20ca7681142179579c273749589cee6b00d820ce2b08eb
+ca13dee0769f9476ef3e045f6263aa805be350c5171c2b2c916b64b003e62420
