diff for duplicates of <1287543276-4511-1-git-send-email-xiaosuo@gmail.com> diff --git a/a/1.txt b/N1/1.txt index dc52059..7302dde 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -193,8 +193,7 @@ diff --git a/net/ipv4/route.c b/net/ipv4/route.c index ff98983..13bbac4 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c -@@ -3182,12 +3182,6 @@ static struct ctl_table ipv4_skeleton[] = - { } +@@ -3182,12 +3182,6 @@ static struct ctl_table ipv4_skeleton[] { } }; -static __net_initdata struct ctl_path ipv4_path[] = { @@ -347,8 +346,7 @@ index eb973fc..87529bb 100644 + }; if (net_eq(net, &init_net)) { - nf_ct_netfilter_header = -diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c + nf_ct_netfilter_header diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c index 7df37fd..ad170df 100644 --- a/net/netfilter/nf_log.c +++ b/net/netfilter/nf_log.c @@ -436,7 +434,7 @@ index cea1c7d..5363afe 100644 + }; + phonet_table_hrd = register_sysctl_paths(phonet_ctl_path, phonet_table); - return phonet_table_hrd == NULL ? -ENOMEM : 0; + return phonet_table_hrd = NULL ? -ENOMEM : 0; } diff --git a/net/rds/ib_sysctl.c b/net/rds/ib_sysctl.c index fc3da37..301a504 100644 @@ -622,7 +620,7 @@ index 397cffe..397a837 100644 + }; table = kmemdup(unix_table, sizeof(unix_table), GFP_KERNEL); - if (table == NULL) + if (table = NULL) diff --git a/net/x25/sysctl_net_x25.c b/net/x25/sysctl_net_x25.c index d2efd29..fcd74db 100644 --- a/net/x25/sysctl_net_x25.c diff --git a/a/content_digest b/N1/content_digest index 6993173..3514302 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,33 +1,7 @@ "From\0Changli Gao <xiaosuo@gmail.com>\0" - "Subject\0[Bridge] [PATCH] net: make ctl_path local and const\0" - "Date\0Wed, 20 Oct 2010 10:54:36 +0800\0" - "To\0David S. Miller <davem@davemloft.net>\0" - "Cc\0Andy Grover <andy.grover@oracle.com>" - linux-sctp@vger.kernel.org - rds-devel@oss.oracle.com - Pekka Savola (ipv6) <pekkas@netcore.fi> - linux-x25@vger.kernel.org - dccp@vger.kernel.org - bridge@lists.linux-foundation.org - James Morris <jmorris@namei.org> - coreteam@netfilter.org - Arnaldo Carvalho de Melo <acme@ghostprotocols.net> - Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> - Joerg Reuter <jreuter@yaina.de> - Sridhar Samudrala <sri@us.ibm.com> - Samuel Ortiz <samuel@sortiz.org> - Changli Gao <xiaosuo@gmail.com> - Vlad Yasevich <vladislav.yasevich@hp.com> - netfilter@vger.kernel.org - Remi Denis-Courmont <remi.denis-courmont@nokia.com> - linux-hams@vger.kernel.org - Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> - netdev@vger.kernel.org - linux-decnet-user@lists.sourceforge.net - linux-kernel@vger.kernel.org - Ralf Baechle <ralf@linux-mips.org> - netfilter-devel@vger.kernel.org - " Andrew Hendry <andrew.hendry@gmail.com>\0" + "Subject\0[PATCH] net: make ctl_path local and const\0" + "Date\0Wed, 20 Oct 2010 02:54:36 +0000\0" + "To\0dccp@vger.kernel.org\0" "\00:1\0" "b\0" "Signed-off-by: Changli Gao <xiaosuo@gmail.com>\n" @@ -225,8 +199,7 @@ "index ff98983..13bbac4 100644\n" "--- a/net/ipv4/route.c\n" "+++ b/net/ipv4/route.c\n" - "@@ -3182,12 +3182,6 @@ static struct ctl_table ipv4_skeleton[] =\n" - " \t{ }\n" + "@@ -3182,12 +3182,6 @@ static struct ctl_table ipv4_skeleton[] \t{ }\n" " };\n" " \n" "-static __net_initdata struct ctl_path ipv4_path[] = {\n" @@ -379,8 +352,7 @@ "+\t};\n" " \n" " \tif (net_eq(net, &init_net)) {\n" - " \t\tnf_ct_netfilter_header =\n" - "diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c\n" + " \t\tnf_ct_netfilter_header diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c\n" "index 7df37fd..ad170df 100644\n" "--- a/net/netfilter/nf_log.c\n" "+++ b/net/netfilter/nf_log.c\n" @@ -468,7 +440,7 @@ "+\t};\n" "+\n" " \tphonet_table_hrd = register_sysctl_paths(phonet_ctl_path, phonet_table);\n" - " \treturn phonet_table_hrd == NULL ? -ENOMEM : 0;\n" + " \treturn phonet_table_hrd = NULL ? -ENOMEM : 0;\n" " }\n" "diff --git a/net/rds/ib_sysctl.c b/net/rds/ib_sysctl.c\n" "index fc3da37..301a504 100644\n" @@ -654,7 +626,7 @@ "+\t};\n" " \n" " \ttable = kmemdup(unix_table, sizeof(unix_table), GFP_KERNEL);\n" - " \tif (table == NULL)\n" + " \tif (table = NULL)\n" "diff --git a/net/x25/sysctl_net_x25.c b/net/x25/sysctl_net_x25.c\n" "index d2efd29..fcd74db 100644\n" "--- a/net/x25/sysctl_net_x25.c\n" @@ -680,4 +652,4 @@ " \tx25_table_header = register_sysctl_paths(x25_path, x25_table);\n" } -6264e066b437c9c5092919352062461291438771c65975687d0001f48108622f +6014423224d7fa12a5e38c9fd3c708bd498adfca7c5fdc9c1dc114fb8e4d2707
diff --git a/a/content_digest b/N2/content_digest index 6993173..62fdf7d 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,33 +1,31 @@ "From\0Changli Gao <xiaosuo@gmail.com>\0" - "Subject\0[Bridge] [PATCH] net: make ctl_path local and const\0" + "Subject\0[PATCH] net: make ctl_path local and const\0" "Date\0Wed, 20 Oct 2010 10:54:36 +0800\0" "To\0David S. Miller <davem@davemloft.net>\0" - "Cc\0Andy Grover <andy.grover@oracle.com>" - linux-sctp@vger.kernel.org - rds-devel@oss.oracle.com + "Cc\0Arnaldo Carvalho de Melo <acme@ghostprotocols.net>" + Joerg Reuter <jreuter@yaina.de> + Ralf Baechle <ralf@linux-mips.org> + Stephen Hemminger <shemminger@linux-foundation.org> + Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> Pekka Savola (ipv6) <pekkas@netcore.fi> - linux-x25@vger.kernel.org - dccp@vger.kernel.org - bridge@lists.linux-foundation.org James Morris <jmorris@namei.org> - coreteam@netfilter.org - Arnaldo Carvalho de Melo <acme@ghostprotocols.net> - Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> - Joerg Reuter <jreuter@yaina.de> - Sridhar Samudrala <sri@us.ibm.com> + Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> + Patrick McHardy <kaber@trash.net> Samuel Ortiz <samuel@sortiz.org> - Changli Gao <xiaosuo@gmail.com> - Vlad Yasevich <vladislav.yasevich@hp.com> - netfilter@vger.kernel.org Remi Denis-Courmont <remi.denis-courmont@nokia.com> - linux-hams@vger.kernel.org - Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> + Andy Grover <andy.grover@oracle.com> + Vlad Yasevich <vladislav.yasevich@hp.com> + Sridhar Samudrala <sri@us.ibm.com> + Andrew Hendry <andrew.hendry@gmail.com> + linux-kernel@vger.kernel.org netdev@vger.kernel.org + linux-hams@vger.kernel.org + bridge@lists.linux-foundation.org + dccp@vger.kernel.org linux-decnet-user@lists.sourceforge.net - linux-kernel@vger.kernel.org - Ralf Baechle <ralf@linux-mips.org> netfilter-devel@vger.kernel.org - " Andrew Hendry <andrew.hendry@gmail.com>\0" + netfilter@vger.kernel.org + " coreteam@netfilter.o\0" "\00:1\0" "b\0" "Signed-off-by: Changli Gao <xiaosuo@gmail.com>\n" @@ -680,4 +678,4 @@ " \tx25_table_header = register_sysctl_paths(x25_path, x25_table);\n" } -6264e066b437c9c5092919352062461291438771c65975687d0001f48108622f +7553af1e390d61678d3fa69859aa35d53af3d7e4150d8bde797d7beee79064a2
diff --git a/a/1.txt b/N3/1.txt index dc52059..7302dde 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -193,8 +193,7 @@ diff --git a/net/ipv4/route.c b/net/ipv4/route.c index ff98983..13bbac4 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c -@@ -3182,12 +3182,6 @@ static struct ctl_table ipv4_skeleton[] = - { } +@@ -3182,12 +3182,6 @@ static struct ctl_table ipv4_skeleton[] { } }; -static __net_initdata struct ctl_path ipv4_path[] = { @@ -347,8 +346,7 @@ index eb973fc..87529bb 100644 + }; if (net_eq(net, &init_net)) { - nf_ct_netfilter_header = -diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c + nf_ct_netfilter_header diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c index 7df37fd..ad170df 100644 --- a/net/netfilter/nf_log.c +++ b/net/netfilter/nf_log.c @@ -436,7 +434,7 @@ index cea1c7d..5363afe 100644 + }; + phonet_table_hrd = register_sysctl_paths(phonet_ctl_path, phonet_table); - return phonet_table_hrd == NULL ? -ENOMEM : 0; + return phonet_table_hrd = NULL ? -ENOMEM : 0; } diff --git a/net/rds/ib_sysctl.c b/net/rds/ib_sysctl.c index fc3da37..301a504 100644 @@ -622,7 +620,7 @@ index 397cffe..397a837 100644 + }; table = kmemdup(unix_table, sizeof(unix_table), GFP_KERNEL); - if (table == NULL) + if (table = NULL) diff --git a/net/x25/sysctl_net_x25.c b/net/x25/sysctl_net_x25.c index d2efd29..fcd74db 100644 --- a/net/x25/sysctl_net_x25.c diff --git a/a/content_digest b/N3/content_digest index 6993173..221920a 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,33 +1,35 @@ "From\0Changli Gao <xiaosuo@gmail.com>\0" - "Subject\0[Bridge] [PATCH] net: make ctl_path local and const\0" - "Date\0Wed, 20 Oct 2010 10:54:36 +0800\0" + "Subject\0[PATCH] net: make ctl_path local and const\0" + "Date\0Wed, 20 Oct 2010 02:54:36 +0000\0" "To\0David S. Miller <davem@davemloft.net>\0" - "Cc\0Andy Grover <andy.grover@oracle.com>" - linux-sctp@vger.kernel.org - rds-devel@oss.oracle.com + "Cc\0Arnaldo Carvalho de Melo <acme@ghostprotocols.net>" + Joerg Reuter <jreuter@yaina.de> + Ralf Baechle <ralf@linux-mips.org> + Stephen Hemminger <shemminger@linux-foundation.org> + Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> Pekka Savola (ipv6) <pekkas@netcore.fi> - linux-x25@vger.kernel.org - dccp@vger.kernel.org - bridge@lists.linux-foundation.org James Morris <jmorris@namei.org> - coreteam@netfilter.org - Arnaldo Carvalho de Melo <acme@ghostprotocols.net> - Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> - Joerg Reuter <jreuter@yaina.de> - Sridhar Samudrala <sri@us.ibm.com> + Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> + Patrick McHardy <kaber@trash.net> Samuel Ortiz <samuel@sortiz.org> - Changli Gao <xiaosuo@gmail.com> - Vlad Yasevich <vladislav.yasevich@hp.com> - netfilter@vger.kernel.org Remi Denis-Courmont <remi.denis-courmont@nokia.com> - linux-hams@vger.kernel.org - Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> + Andy Grover <andy.grover@oracle.com> + Vlad Yasevich <vladislav.yasevich@hp.com> + Sridhar Samudrala <sri@us.ibm.com> + Andrew Hendry <andrew.hendry@gmail.com> + linux-kernel@vger.kernel.org netdev@vger.kernel.org + linux-hams@vger.kernel.org + bridge@lists.linux-foundation.org + dccp@vger.kernel.org linux-decnet-user@lists.sourceforge.net - linux-kernel@vger.kernel.org - Ralf Baechle <ralf@linux-mips.org> netfilter-devel@vger.kernel.org - " Andrew Hendry <andrew.hendry@gmail.com>\0" + netfilter@vger.kernel.org + coreteam@netfilter.org + rds-devel@oss.oracle.com + linux-sctp@vger.kernel.org + linux-x25@vger.kernel.org + " Changli Gao <xiaosuo@gmail.com>\0" "\00:1\0" "b\0" "Signed-off-by: Changli Gao <xiaosuo@gmail.com>\n" @@ -225,8 +227,7 @@ "index ff98983..13bbac4 100644\n" "--- a/net/ipv4/route.c\n" "+++ b/net/ipv4/route.c\n" - "@@ -3182,12 +3182,6 @@ static struct ctl_table ipv4_skeleton[] =\n" - " \t{ }\n" + "@@ -3182,12 +3182,6 @@ static struct ctl_table ipv4_skeleton[] \t{ }\n" " };\n" " \n" "-static __net_initdata struct ctl_path ipv4_path[] = {\n" @@ -379,8 +380,7 @@ "+\t};\n" " \n" " \tif (net_eq(net, &init_net)) {\n" - " \t\tnf_ct_netfilter_header =\n" - "diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c\n" + " \t\tnf_ct_netfilter_header diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c\n" "index 7df37fd..ad170df 100644\n" "--- a/net/netfilter/nf_log.c\n" "+++ b/net/netfilter/nf_log.c\n" @@ -468,7 +468,7 @@ "+\t};\n" "+\n" " \tphonet_table_hrd = register_sysctl_paths(phonet_ctl_path, phonet_table);\n" - " \treturn phonet_table_hrd == NULL ? -ENOMEM : 0;\n" + " \treturn phonet_table_hrd = NULL ? -ENOMEM : 0;\n" " }\n" "diff --git a/net/rds/ib_sysctl.c b/net/rds/ib_sysctl.c\n" "index fc3da37..301a504 100644\n" @@ -654,7 +654,7 @@ "+\t};\n" " \n" " \ttable = kmemdup(unix_table, sizeof(unix_table), GFP_KERNEL);\n" - " \tif (table == NULL)\n" + " \tif (table = NULL)\n" "diff --git a/net/x25/sysctl_net_x25.c b/net/x25/sysctl_net_x25.c\n" "index d2efd29..fcd74db 100644\n" "--- a/net/x25/sysctl_net_x25.c\n" @@ -680,4 +680,4 @@ " \tx25_table_header = register_sysctl_paths(x25_path, x25_table);\n" } -6264e066b437c9c5092919352062461291438771c65975687d0001f48108622f +2f471bb7463aad63d55c848976f52773712be06217fd1c81324659497cbb5628
diff --git a/a/content_digest b/N4/content_digest index 6993173..29d5a81 100644 --- a/a/content_digest +++ b/N4/content_digest @@ -1,33 +1,35 @@ "From\0Changli Gao <xiaosuo@gmail.com>\0" - "Subject\0[Bridge] [PATCH] net: make ctl_path local and const\0" + "Subject\0[PATCH] net: make ctl_path local and const\0" "Date\0Wed, 20 Oct 2010 10:54:36 +0800\0" "To\0David S. Miller <davem@davemloft.net>\0" - "Cc\0Andy Grover <andy.grover@oracle.com>" - linux-sctp@vger.kernel.org - rds-devel@oss.oracle.com + "Cc\0Arnaldo Carvalho de Melo <acme@ghostprotocols.net>" + Joerg Reuter <jreuter@yaina.de> + Ralf Baechle <ralf@linux-mips.org> + Stephen Hemminger <shemminger@linux-foundation.org> + Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> Pekka Savola (ipv6) <pekkas@netcore.fi> - linux-x25@vger.kernel.org - dccp@vger.kernel.org - bridge@lists.linux-foundation.org James Morris <jmorris@namei.org> - coreteam@netfilter.org - Arnaldo Carvalho de Melo <acme@ghostprotocols.net> - Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> - Joerg Reuter <jreuter@yaina.de> - Sridhar Samudrala <sri@us.ibm.com> + Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> + Patrick McHardy <kaber@trash.net> Samuel Ortiz <samuel@sortiz.org> - Changli Gao <xiaosuo@gmail.com> - Vlad Yasevich <vladislav.yasevich@hp.com> - netfilter@vger.kernel.org Remi Denis-Courmont <remi.denis-courmont@nokia.com> - linux-hams@vger.kernel.org - Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> + Andy Grover <andy.grover@oracle.com> + Vlad Yasevich <vladislav.yasevich@hp.com> + Sridhar Samudrala <sri@us.ibm.com> + Andrew Hendry <andrew.hendry@gmail.com> + linux-kernel@vger.kernel.org netdev@vger.kernel.org + linux-hams@vger.kernel.org + bridge@lists.linux-foundation.org + dccp@vger.kernel.org linux-decnet-user@lists.sourceforge.net - linux-kernel@vger.kernel.org - Ralf Baechle <ralf@linux-mips.org> netfilter-devel@vger.kernel.org - " Andrew Hendry <andrew.hendry@gmail.com>\0" + netfilter@vger.kernel.org + coreteam@netfilter.org + rds-devel@oss.oracle.com + linux-sctp@vger.kernel.org + linux-x25@vger.kernel.org + " Changli Gao <xiaosuo@gmail.com>\0" "\00:1\0" "b\0" "Signed-off-by: Changli Gao <xiaosuo@gmail.com>\n" @@ -680,4 +682,4 @@ " \tx25_table_header = register_sysctl_paths(x25_path, x25_table);\n" } -6264e066b437c9c5092919352062461291438771c65975687d0001f48108622f +a3dd20c81e3cf9ec0b67ef55cf84dd6ddb7d962cfebb2a6320bbcaef4f8d11e9
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.