diff for duplicates of <20200717062331.691152-11-hch@lst.de>
diff --git a/a/1.txt b/N1/1.txt
index 03f1475..f2fa303 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -2,7 +2,7 @@ Merge the native and compat {get,set}sockopt handlers using
in_compat_syscall(). Note that this required moving a fair
amout of code around to be done sanely.
-Signed-off-by: Christoph Hellwig <hch(a)lst.de>
+Signed-off-by: Christoph Hellwig <hch@lst.de>
---
net/bridge/netfilter/ebtables.c | 214 +++++++++++++++-----------------
1 file changed, 98 insertions(+), 116 deletions(-)
diff --git a/a/content_digest b/N1/content_digest
index b6d173d..0f87532 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,17 +1,42 @@
[
- "From\0Christoph Hellwig <hch at lst.de>\0"
+ "ref\00020200717062331.691152-1-hch\@lst.de\0"
]
[
- "Subject\0[MPTCP] [PATCH 10/22] netfilter/ebtables: clean up compat {get, set}sockopt handling\0"
+ "From\0Christoph Hellwig <hch\@lst.de>\0"
+]
+[
+ "Subject\0[PATCH 10/22] netfilter/ebtables: clean up compat {get,set}sockopt handling\0"
]
[
"Date\0Fri, 17 Jul 2020 08:23:19 +0200\0"
]
[
- "To\0mptcp at lists.01.org\0"
+ "To\0David S. Miller <davem\@davemloft.net>\0"
+]
+[
+ "Cc\0Alexei Starovoitov <ast\@kernel.org>",
+ " Daniel Borkmann <daniel\@iogearbox.net>",
+ " Chas Williams <3chas3\@gmail.com>",
+ " Pablo Neira Ayuso <pablo\@netfilter.org>",
+ " Jozsef Kadlecsik <kadlec\@netfilter.org>",
+ " Florian Westphal <fw\@strlen.de>",
+ " Alexey Kuznetsov <kuznet\@ms2.inr.ac.ru>",
+ " Hideaki YOSHIFUJI <yoshfuji\@linux-ipv6.org>",
+ " linux-kernel\@vger.kernel.org",
+ " netdev\@vger.kernel.org",
+ " bpf\@vger.kernel.org",
+ " netfilter-devel\@vger.kernel.org",
+ " linux-sctp\@vger.kernel.org",
+ " linux-arch\@vger.kernel.org",
+ " linux-bluetooth\@vger.kernel.org",
+ " bridge\@lists.linux-foundation.org",
+ " linux-can\@vger.kernel.org",
+ " dccp\@vger.kernel.org",
+ " linux-wpan\@vger.kernel.org",
+ " mptcp\@lists.01.org\0"
]
[
- "\0001:1\0"
+ "\0000:1\0"
]
[
"b\0"
@@ -21,7 +46,7 @@
"in_compat_syscall(). Note that this required moving a fair\n",
"amout of code around to be done sanely.\n",
"\n",
- "Signed-off-by: Christoph Hellwig <hch(a)lst.de>\n",
+ "Signed-off-by: Christoph Hellwig <hch\@lst.de>\n",
"---\n",
" net/bridge/netfilter/ebtables.c | 214 +++++++++++++++-----------------\n",
" 1 file changed, 98 insertions(+), 116 deletions(-)\n",
@@ -284,4 +309,4 @@
"2.27.0"
]
-7bd9203fea1c1813d356c60aa2b3d300e4c42d20d202dbd5cf5d1aaf683991d3
+dba3b0af4a56db1f681161af51574307987d99414d91f39222da5b67d368af3d
diff --git a/a/1.txt b/N2/1.txt
index 03f1475..a4b9396 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -2,7 +2,7 @@ Merge the native and compat {get,set}sockopt handlers using
in_compat_syscall(). Note that this required moving a fair
amout of code around to be done sanely.
-Signed-off-by: Christoph Hellwig <hch(a)lst.de>
+Signed-off-by: Christoph Hellwig <hch@lst.de>
---
net/bridge/netfilter/ebtables.c | 214 +++++++++++++++-----------------
1 file changed, 98 insertions(+), 116 deletions(-)
@@ -64,7 +64,7 @@ index c83ffe9121639c..fe13108af1f542 100644
- mutex_unlock(&ebt_mutex);
- break;
- }
-- if (cmd == EBT_SO_GET_INFO) {
+- if (cmd = EBT_SO_GET_INFO) {
- tmp.nentries = t->private->nentries;
- tmp.entries_size = t->private->entries_size;
- tmp.valid_hooks = t->valid_hooks;
@@ -135,8 +135,8 @@ index c83ffe9121639c..fe13108af1f542 100644
- return -EPERM;
-
- /* try real handler in case userland supplied needed padding */
-- if ((cmd == EBT_SO_GET_INFO ||
-- cmd == EBT_SO_GET_INIT_INFO) && *len != sizeof(tmp))
+- if ((cmd = EBT_SO_GET_INFO ||
+- cmd = EBT_SO_GET_INIT_INFO) && *len != sizeof(tmp))
- return do_ebt_get_ctl(sk, cmd, user, len);
-
if (copy_from_user(&tmp, user, sizeof(tmp)))
@@ -181,7 +181,7 @@ index c83ffe9121639c..fe13108af1f542 100644
+ mutex_unlock(&ebt_mutex);
+ break;
+ }
-+ if (cmd == EBT_SO_GET_INFO) {
++ if (cmd = EBT_SO_GET_INFO) {
+ tmp.nentries = t->private->nentries;
+ tmp.entries_size = t->private->entries_size;
+ tmp.valid_hooks = t->valid_hooks;
diff --git a/a/content_digest b/N2/content_digest
index b6d173d..0544937 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -1,17 +1,42 @@
[
- "From\0Christoph Hellwig <hch at lst.de>\0"
+ "ref\00020200717062331.691152-1-hch\@lst.de\0"
]
[
- "Subject\0[MPTCP] [PATCH 10/22] netfilter/ebtables: clean up compat {get, set}sockopt handling\0"
+ "From\0Christoph Hellwig <hch\@lst.de>\0"
]
[
- "Date\0Fri, 17 Jul 2020 08:23:19 +0200\0"
+ "Subject\0[PATCH 10/22] netfilter/ebtables: clean up compat {get,set}sockopt handling\0"
]
[
- "To\0mptcp at lists.01.org\0"
+ "Date\0Fri, 17 Jul 2020 06:23:19 +0000\0"
]
[
- "\0001:1\0"
+ "To\0David S. Miller <davem\@davemloft.net>\0"
+]
+[
+ "Cc\0Alexei Starovoitov <ast\@kernel.org>",
+ " Daniel Borkmann <daniel\@iogearbox.net>",
+ " Chas Williams <3chas3\@gmail.com>",
+ " Pablo Neira Ayuso <pablo\@netfilter.org>",
+ " Jozsef Kadlecsik <kadlec\@netfilter.org>",
+ " Florian Westphal <fw\@strlen.de>",
+ " Alexey Kuznetsov <kuznet\@ms2.inr.ac.ru>",
+ " Hideaki YOSHIFUJI <yoshfuji\@linux-ipv6.org>",
+ " linux-kernel\@vger.kernel.org",
+ " netdev\@vger.kernel.org",
+ " bpf\@vger.kernel.org",
+ " netfilter-devel\@vger.kernel.org",
+ " linux-sctp\@vger.kernel.org",
+ " linux-arch\@vger.kernel.org",
+ " linux-bluetooth\@vger.kernel.org",
+ " bridge\@lists.linux-foundation.org",
+ " linux-can\@vger.kernel.org",
+ " dccp\@vger.kernel.org",
+ " linux-wpan\@vger.kernel.org",
+ " mptcp\@lists.01.org\0"
+]
+[
+ "\0000:1\0"
]
[
"b\0"
@@ -21,7 +46,7 @@
"in_compat_syscall(). Note that this required moving a fair\n",
"amout of code around to be done sanely.\n",
"\n",
- "Signed-off-by: Christoph Hellwig <hch(a)lst.de>\n",
+ "Signed-off-by: Christoph Hellwig <hch\@lst.de>\n",
"---\n",
" net/bridge/netfilter/ebtables.c | 214 +++++++++++++++-----------------\n",
" 1 file changed, 98 insertions(+), 116 deletions(-)\n",
@@ -83,7 +108,7 @@
"-\t\t\tmutex_unlock(&ebt_mutex);\n",
"-\t\t\tbreak;\n",
"-\t\t}\n",
- "-\t\tif (cmd == EBT_SO_GET_INFO) {\n",
+ "-\t\tif (cmd = EBT_SO_GET_INFO) {\n",
"-\t\t\ttmp.nentries = t->private->nentries;\n",
"-\t\t\ttmp.entries_size = t->private->entries_size;\n",
"-\t\t\ttmp.valid_hooks = t->valid_hooks;\n",
@@ -154,8 +179,8 @@
"-\t\treturn -EPERM;\n",
"-\n",
"-\t/* try real handler in case userland supplied needed padding */\n",
- "-\tif ((cmd == EBT_SO_GET_INFO ||\n",
- "-\t cmd == EBT_SO_GET_INIT_INFO) && *len != sizeof(tmp))\n",
+ "-\tif ((cmd = EBT_SO_GET_INFO ||\n",
+ "-\t cmd = EBT_SO_GET_INIT_INFO) && *len != sizeof(tmp))\n",
"-\t\t\treturn do_ebt_get_ctl(sk, cmd, user, len);\n",
"-\n",
" \tif (copy_from_user(&tmp, user, sizeof(tmp)))\n",
@@ -200,7 +225,7 @@
"+\t\t\tmutex_unlock(&ebt_mutex);\n",
"+\t\t\tbreak;\n",
"+\t\t}\n",
- "+\t\tif (cmd == EBT_SO_GET_INFO) {\n",
+ "+\t\tif (cmd = EBT_SO_GET_INFO) {\n",
"+\t\t\ttmp.nentries = t->private->nentries;\n",
"+\t\t\ttmp.entries_size = t->private->entries_size;\n",
"+\t\t\ttmp.valid_hooks = t->valid_hooks;\n",
@@ -284,4 +309,4 @@
"2.27.0"
]
-7bd9203fea1c1813d356c60aa2b3d300e4c42d20d202dbd5cf5d1aaf683991d3
+5a95cf8963e1c8939ac14a7427966ff418888547e3f126f2eba5ea5a70602fb5
diff --git a/a/1.txt b/N3/1.txt
index 03f1475..a4b9396 100644
--- a/a/1.txt
+++ b/N3/1.txt
@@ -2,7 +2,7 @@ Merge the native and compat {get,set}sockopt handlers using
in_compat_syscall(). Note that this required moving a fair
amout of code around to be done sanely.
-Signed-off-by: Christoph Hellwig <hch(a)lst.de>
+Signed-off-by: Christoph Hellwig <hch@lst.de>
---
net/bridge/netfilter/ebtables.c | 214 +++++++++++++++-----------------
1 file changed, 98 insertions(+), 116 deletions(-)
@@ -64,7 +64,7 @@ index c83ffe9121639c..fe13108af1f542 100644
- mutex_unlock(&ebt_mutex);
- break;
- }
-- if (cmd == EBT_SO_GET_INFO) {
+- if (cmd = EBT_SO_GET_INFO) {
- tmp.nentries = t->private->nentries;
- tmp.entries_size = t->private->entries_size;
- tmp.valid_hooks = t->valid_hooks;
@@ -135,8 +135,8 @@ index c83ffe9121639c..fe13108af1f542 100644
- return -EPERM;
-
- /* try real handler in case userland supplied needed padding */
-- if ((cmd == EBT_SO_GET_INFO ||
-- cmd == EBT_SO_GET_INIT_INFO) && *len != sizeof(tmp))
+- if ((cmd = EBT_SO_GET_INFO ||
+- cmd = EBT_SO_GET_INIT_INFO) && *len != sizeof(tmp))
- return do_ebt_get_ctl(sk, cmd, user, len);
-
if (copy_from_user(&tmp, user, sizeof(tmp)))
@@ -181,7 +181,7 @@ index c83ffe9121639c..fe13108af1f542 100644
+ mutex_unlock(&ebt_mutex);
+ break;
+ }
-+ if (cmd == EBT_SO_GET_INFO) {
++ if (cmd = EBT_SO_GET_INFO) {
+ tmp.nentries = t->private->nentries;
+ tmp.entries_size = t->private->entries_size;
+ tmp.valid_hooks = t->valid_hooks;
diff --git a/a/content_digest b/N3/content_digest
index b6d173d..f6f94e1 100644
--- a/a/content_digest
+++ b/N3/content_digest
@@ -1,17 +1,17 @@
[
- "From\0Christoph Hellwig <hch at lst.de>\0"
+ "From\0Christoph Hellwig <hch\@lst.de>\0"
]
[
- "Subject\0[MPTCP] [PATCH 10/22] netfilter/ebtables: clean up compat {get, set}sockopt handling\0"
+ "Subject\0[PATCH 10/22] netfilter/ebtables: clean up compat {get,set}sockopt handling\0"
]
[
- "Date\0Fri, 17 Jul 2020 08:23:19 +0200\0"
+ "Date\0Fri, 17 Jul 2020 06:23:19 +0000\0"
]
[
- "To\0mptcp at lists.01.org\0"
+ "To\0dccp\@vger.kernel.org\0"
]
[
- "\0001:1\0"
+ "\0000:1\0"
]
[
"b\0"
@@ -21,7 +21,7 @@
"in_compat_syscall(). Note that this required moving a fair\n",
"amout of code around to be done sanely.\n",
"\n",
- "Signed-off-by: Christoph Hellwig <hch(a)lst.de>\n",
+ "Signed-off-by: Christoph Hellwig <hch\@lst.de>\n",
"---\n",
" net/bridge/netfilter/ebtables.c | 214 +++++++++++++++-----------------\n",
" 1 file changed, 98 insertions(+), 116 deletions(-)\n",
@@ -83,7 +83,7 @@
"-\t\t\tmutex_unlock(&ebt_mutex);\n",
"-\t\t\tbreak;\n",
"-\t\t}\n",
- "-\t\tif (cmd == EBT_SO_GET_INFO) {\n",
+ "-\t\tif (cmd = EBT_SO_GET_INFO) {\n",
"-\t\t\ttmp.nentries = t->private->nentries;\n",
"-\t\t\ttmp.entries_size = t->private->entries_size;\n",
"-\t\t\ttmp.valid_hooks = t->valid_hooks;\n",
@@ -154,8 +154,8 @@
"-\t\treturn -EPERM;\n",
"-\n",
"-\t/* try real handler in case userland supplied needed padding */\n",
- "-\tif ((cmd == EBT_SO_GET_INFO ||\n",
- "-\t cmd == EBT_SO_GET_INIT_INFO) && *len != sizeof(tmp))\n",
+ "-\tif ((cmd = EBT_SO_GET_INFO ||\n",
+ "-\t cmd = EBT_SO_GET_INIT_INFO) && *len != sizeof(tmp))\n",
"-\t\t\treturn do_ebt_get_ctl(sk, cmd, user, len);\n",
"-\n",
" \tif (copy_from_user(&tmp, user, sizeof(tmp)))\n",
@@ -200,7 +200,7 @@
"+\t\t\tmutex_unlock(&ebt_mutex);\n",
"+\t\t\tbreak;\n",
"+\t\t}\n",
- "+\t\tif (cmd == EBT_SO_GET_INFO) {\n",
+ "+\t\tif (cmd = EBT_SO_GET_INFO) {\n",
"+\t\t\ttmp.nentries = t->private->nentries;\n",
"+\t\t\ttmp.entries_size = t->private->entries_size;\n",
"+\t\t\ttmp.valid_hooks = t->valid_hooks;\n",
@@ -284,4 +284,4 @@
"2.27.0"
]
-7bd9203fea1c1813d356c60aa2b3d300e4c42d20d202dbd5cf5d1aaf683991d3
+33d173706473131db09bcf1f84ec2f37d340aee080b14b0f743cd5686f20e895
diff --git a/a/1.txt b/N4/1.txt
index 03f1475..f2fa303 100644
--- a/a/1.txt
+++ b/N4/1.txt
@@ -2,7 +2,7 @@ Merge the native and compat {get,set}sockopt handlers using
in_compat_syscall(). Note that this required moving a fair
amout of code around to be done sanely.
-Signed-off-by: Christoph Hellwig <hch(a)lst.de>
+Signed-off-by: Christoph Hellwig <hch@lst.de>
---
net/bridge/netfilter/ebtables.c | 214 +++++++++++++++-----------------
1 file changed, 98 insertions(+), 116 deletions(-)
diff --git a/a/content_digest b/N4/content_digest
index b6d173d..c57b115 100644
--- a/a/content_digest
+++ b/N4/content_digest
@@ -1,17 +1,42 @@
[
- "From\0Christoph Hellwig <hch at lst.de>\0"
+ "ref\00020200717062331.691152-1-hch\@lst.de\0"
]
[
- "Subject\0[MPTCP] [PATCH 10/22] netfilter/ebtables: clean up compat {get, set}sockopt handling\0"
+ "From\0Christoph Hellwig <hch\@lst.de>\0"
+]
+[
+ "Subject\0[Bridge] [PATCH 10/22] netfilter/ebtables: clean up compat {get, set}sockopt handling\0"
]
[
"Date\0Fri, 17 Jul 2020 08:23:19 +0200\0"
]
[
- "To\0mptcp at lists.01.org\0"
+ "To\0David S. Miller <davem\@davemloft.net>\0"
+]
+[
+ "Cc\0linux-arch\@vger.kernel.org",
+ " Daniel Borkmann <daniel\@iogearbox.net>",
+ " dccp\@vger.kernel.org",
+ " Hideaki YOSHIFUJI <yoshfuji\@linux-ipv6.org>",
+ " linux-kernel\@vger.kernel.org",
+ " bridge\@lists.linux-foundation.org",
+ " Florian Westphal <fw\@strlen.de>",
+ " Alexei Starovoitov <ast\@kernel.org>",
+ " Jozsef Kadlecsik <kadlec\@netfilter.org>",
+ " linux-bluetooth\@vger.kernel.org",
+ " linux-sctp\@vger.kernel.org",
+ " netfilter-devel\@vger.kernel.org",
+ " mptcp\@lists.01.org",
+ " Chas Williams <3chas3\@gmail.com>",
+ " netdev\@vger.kernel.org",
+ " Alexey Kuznetsov <kuznet\@ms2.inr.ac.ru>",
+ " bpf\@vger.kernel.org",
+ " linux-can\@vger.kernel.org",
+ " linux-wpan\@vger.kernel.org",
+ " Pablo Neira Ayuso <pablo\@netfilter.org>\0"
]
[
- "\0001:1\0"
+ "\0000:1\0"
]
[
"b\0"
@@ -21,7 +46,7 @@
"in_compat_syscall(). Note that this required moving a fair\n",
"amout of code around to be done sanely.\n",
"\n",
- "Signed-off-by: Christoph Hellwig <hch(a)lst.de>\n",
+ "Signed-off-by: Christoph Hellwig <hch\@lst.de>\n",
"---\n",
" net/bridge/netfilter/ebtables.c | 214 +++++++++++++++-----------------\n",
" 1 file changed, 98 insertions(+), 116 deletions(-)\n",
@@ -284,4 +309,4 @@
"2.27.0"
]
-7bd9203fea1c1813d356c60aa2b3d300e4c42d20d202dbd5cf5d1aaf683991d3
+711f5bd43d5a11c8c495afd09171f8a47fffae5b423c2977291404190fa0a247
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.