diff for duplicates of <20200717062331.691152-15-hch@lst.de>
diff --git a/a/1.txt b/N1/1.txt
index 25db217..ab4d83d 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,7 +1,7 @@
Factor out one helper each for getting the native and compat
version of the MCAST_MSFILTER option.
-Signed-off-by: Christoph Hellwig <hch(a)lst.de>
+Signed-off-by: Christoph Hellwig <hch@lst.de>
---
net/ipv4/ip_sockglue.c | 131 ++++++++++++++++++++++-------------------
1 file changed, 70 insertions(+), 61 deletions(-)
diff --git a/a/content_digest b/N1/content_digest
index e863b01..c35afc5 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 14/22] net/ipv4: factor out MCAST_MSFILTER getsockopt helpers\0"
+ "From\0Christoph Hellwig <hch\@lst.de>\0"
+]
+[
+ "Subject\0[PATCH 14/22] net/ipv4: factor out MCAST_MSFILTER getsockopt helpers\0"
]
[
"Date\0Fri, 17 Jul 2020 08:23:23 +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"
@@ -20,7 +45,7 @@
"Factor out one helper each for getting the native and compat\n",
"version of the MCAST_MSFILTER option.\n",
"\n",
- "Signed-off-by: Christoph Hellwig <hch(a)lst.de>\n",
+ "Signed-off-by: Christoph Hellwig <hch\@lst.de>\n",
"---\n",
" net/ipv4/ip_sockglue.c | 131 ++++++++++++++++++++++-------------------\n",
" 1 file changed, 70 insertions(+), 61 deletions(-)\n",
@@ -188,4 +213,4 @@
"2.27.0"
]
-de0325f31b7e69e426fa580d53a9186ddfd5bbc107b5219e9224572e2bc96c5f
+248e5d8a915c03bc219a2df97412045c77cb01f959cd5db760c54db2442621bd
diff --git a/a/1.txt b/N2/1.txt
index 25db217..b687bb6 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -1,7 +1,7 @@
Factor out one helper each for getting the native and compat
version of the MCAST_MSFILTER option.
-Signed-off-by: Christoph Hellwig <hch(a)lst.de>
+Signed-off-by: Christoph Hellwig <hch@lst.de>
---
net/ipv4/ip_sockglue.c | 131 ++++++++++++++++++++++-------------------
1 file changed, 70 insertions(+), 61 deletions(-)
@@ -121,7 +121,7 @@ index 95f4248c6fc5ed..70d32c9476a2e3 100644
@@ -1762,45 +1807,9 @@ int compat_ip_getsockopt(struct sock *sk, int level, int optname,
int err;
- if (optname == MCAST_MSFILTER) {
+ if (optname = MCAST_MSFILTER) {
- const int size0 = offsetof(struct compat_group_filter, gf_slist);
- struct compat_group_filter __user *p = (void __user *)optval;
- struct compat_group_filter gf32;
diff --git a/a/content_digest b/N2/content_digest
index e863b01..7ef8551 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 14/22] net/ipv4: factor out MCAST_MSFILTER getsockopt helpers\0"
+ "From\0Christoph Hellwig <hch\@lst.de>\0"
]
[
- "Date\0Fri, 17 Jul 2020 08:23:23 +0200\0"
+ "Subject\0[PATCH 14/22] net/ipv4: factor out MCAST_MSFILTER getsockopt helpers\0"
]
[
- "To\0mptcp at lists.01.org\0"
+ "Date\0Fri, 17 Jul 2020 06:23:23 +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"
@@ -20,7 +45,7 @@
"Factor out one helper each for getting the native and compat\n",
"version of the MCAST_MSFILTER option.\n",
"\n",
- "Signed-off-by: Christoph Hellwig <hch(a)lst.de>\n",
+ "Signed-off-by: Christoph Hellwig <hch\@lst.de>\n",
"---\n",
" net/ipv4/ip_sockglue.c | 131 ++++++++++++++++++++++-------------------\n",
" 1 file changed, 70 insertions(+), 61 deletions(-)\n",
@@ -140,7 +165,7 @@
"\@\@ -1762,45 +1807,9 \@\@ int compat_ip_getsockopt(struct sock *sk, int level, int optname,\n",
" \tint err;\n",
" \n",
- " \tif (optname == MCAST_MSFILTER) {\n",
+ " \tif (optname = MCAST_MSFILTER) {\n",
"-\t\tconst int size0 = offsetof(struct compat_group_filter, gf_slist);\n",
"-\t\tstruct compat_group_filter __user *p = (void __user *)optval;\n",
"-\t\tstruct compat_group_filter gf32;\n",
@@ -188,4 +213,4 @@
"2.27.0"
]
-de0325f31b7e69e426fa580d53a9186ddfd5bbc107b5219e9224572e2bc96c5f
+dfdc944cb25e7746baa755786318775fe24fce03c862b3425f909548dfaa0a2d
diff --git a/a/1.txt b/N3/1.txt
index 25db217..b687bb6 100644
--- a/a/1.txt
+++ b/N3/1.txt
@@ -1,7 +1,7 @@
Factor out one helper each for getting the native and compat
version of the MCAST_MSFILTER option.
-Signed-off-by: Christoph Hellwig <hch(a)lst.de>
+Signed-off-by: Christoph Hellwig <hch@lst.de>
---
net/ipv4/ip_sockglue.c | 131 ++++++++++++++++++++++-------------------
1 file changed, 70 insertions(+), 61 deletions(-)
@@ -121,7 +121,7 @@ index 95f4248c6fc5ed..70d32c9476a2e3 100644
@@ -1762,45 +1807,9 @@ int compat_ip_getsockopt(struct sock *sk, int level, int optname,
int err;
- if (optname == MCAST_MSFILTER) {
+ if (optname = MCAST_MSFILTER) {
- const int size0 = offsetof(struct compat_group_filter, gf_slist);
- struct compat_group_filter __user *p = (void __user *)optval;
- struct compat_group_filter gf32;
diff --git a/a/content_digest b/N3/content_digest
index e863b01..38f3155 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 14/22] net/ipv4: factor out MCAST_MSFILTER getsockopt helpers\0"
+ "Subject\0[PATCH 14/22] net/ipv4: factor out MCAST_MSFILTER getsockopt helpers\0"
]
[
- "Date\0Fri, 17 Jul 2020 08:23:23 +0200\0"
+ "Date\0Fri, 17 Jul 2020 06:23:23 +0000\0"
]
[
- "To\0mptcp at lists.01.org\0"
+ "To\0dccp\@vger.kernel.org\0"
]
[
- "\0001:1\0"
+ "\0000:1\0"
]
[
"b\0"
@@ -20,7 +20,7 @@
"Factor out one helper each for getting the native and compat\n",
"version of the MCAST_MSFILTER option.\n",
"\n",
- "Signed-off-by: Christoph Hellwig <hch(a)lst.de>\n",
+ "Signed-off-by: Christoph Hellwig <hch\@lst.de>\n",
"---\n",
" net/ipv4/ip_sockglue.c | 131 ++++++++++++++++++++++-------------------\n",
" 1 file changed, 70 insertions(+), 61 deletions(-)\n",
@@ -140,7 +140,7 @@
"\@\@ -1762,45 +1807,9 \@\@ int compat_ip_getsockopt(struct sock *sk, int level, int optname,\n",
" \tint err;\n",
" \n",
- " \tif (optname == MCAST_MSFILTER) {\n",
+ " \tif (optname = MCAST_MSFILTER) {\n",
"-\t\tconst int size0 = offsetof(struct compat_group_filter, gf_slist);\n",
"-\t\tstruct compat_group_filter __user *p = (void __user *)optval;\n",
"-\t\tstruct compat_group_filter gf32;\n",
@@ -188,4 +188,4 @@
"2.27.0"
]
-de0325f31b7e69e426fa580d53a9186ddfd5bbc107b5219e9224572e2bc96c5f
+6aa11bfd93bd227537dff3f8d56a6e07d4ad45dcf8a8c4ba0ee4ff6ef20b2eac
diff --git a/a/1.txt b/N4/1.txt
index 25db217..ab4d83d 100644
--- a/a/1.txt
+++ b/N4/1.txt
@@ -1,7 +1,7 @@
Factor out one helper each for getting the native and compat
version of the MCAST_MSFILTER option.
-Signed-off-by: Christoph Hellwig <hch(a)lst.de>
+Signed-off-by: Christoph Hellwig <hch@lst.de>
---
net/ipv4/ip_sockglue.c | 131 ++++++++++++++++++++++-------------------
1 file changed, 70 insertions(+), 61 deletions(-)
diff --git a/a/content_digest b/N4/content_digest
index e863b01..19ca367 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 14/22] net/ipv4: factor out MCAST_MSFILTER getsockopt helpers\0"
+ "From\0Christoph Hellwig <hch\@lst.de>\0"
+]
+[
+ "Subject\0[Bridge] [PATCH 14/22] net/ipv4: factor out MCAST_MSFILTER getsockopt helpers\0"
]
[
"Date\0Fri, 17 Jul 2020 08:23:23 +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"
@@ -20,7 +45,7 @@
"Factor out one helper each for getting the native and compat\n",
"version of the MCAST_MSFILTER option.\n",
"\n",
- "Signed-off-by: Christoph Hellwig <hch(a)lst.de>\n",
+ "Signed-off-by: Christoph Hellwig <hch\@lst.de>\n",
"---\n",
" net/ipv4/ip_sockglue.c | 131 ++++++++++++++++++++++-------------------\n",
" 1 file changed, 70 insertions(+), 61 deletions(-)\n",
@@ -188,4 +213,4 @@
"2.27.0"
]
-de0325f31b7e69e426fa580d53a9186ddfd5bbc107b5219e9224572e2bc96c5f
+d38854cd9753795e8d182de6a3761cb2afa0f6de0d7302af0e2aa6133bff8dcf
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.