diff for duplicates of <20200717062331.691152-6-hch@lst.de>
diff --git a/a/1.txt b/N1/1.txt
index 6ecb999..b1978a8 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -2,7 +2,7 @@ Add the compat handling to sock_common_{get,set}sockopt instead,
keyed of in_compat_syscall(). This allow to remove the now unused
->compat_{get,set}sockopt methods from struct proto_ops.
-Signed-off-by: Christoph Hellwig <hch(a)lst.de>
+Signed-off-by: Christoph Hellwig <hch@lst.de>
---
include/linux/net.h | 6 ------
include/net/sock.h | 4 ----
diff --git a/a/content_digest b/N1/content_digest
index 0455dd3..7ff06da 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 05/22] net: remove compat_sock_common_{get, set}sockopt\0"
+ "From\0Christoph Hellwig <hch\@lst.de>\0"
+]
+[
+ "Subject\0[PATCH 05/22] net: remove compat_sock_common_{get,set}sockopt\0"
]
[
"Date\0Fri, 17 Jul 2020 08:23:14 +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 @@
"keyed of in_compat_syscall(). This allow to remove the now unused\n",
"->compat_{get,set}sockopt methods from struct proto_ops.\n",
"\n",
- "Signed-off-by: Christoph Hellwig <hch(a)lst.de>\n",
+ "Signed-off-by: Christoph Hellwig <hch\@lst.de>\n",
"---\n",
" include/linux/net.h | 6 ------\n",
" include/net/sock.h | 4 ----\n",
@@ -393,4 +418,4 @@
"2.27.0"
]
-487e4ad4a185ed4df684cf850c6ad86b88d2e3058e701d475f2ab602ff899213
+92f58de14ca5f2ef1ec4a63620a9d971a7ee1c1977fa2716727ab9df771fa6b8
diff --git a/a/1.txt b/N2/1.txt
index 6ecb999..de5b479 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -2,7 +2,7 @@ Add the compat handling to sock_common_{get,set}sockopt instead,
keyed of in_compat_syscall(). This allow to remove the now unused
->compat_{get,set}sockopt methods from struct proto_ops.
-Signed-off-by: Christoph Hellwig <hch(a)lst.de>
+Signed-off-by: Christoph Hellwig <hch@lst.de>
---
include/linux/net.h | 6 ------
include/net/sock.h | 4 ----
@@ -227,11 +227,11 @@ index 20576e87a5f7e8..6ab44ec2c369da 100644
{
int err;
-- if (level == SOL_IP && sk->sk_type != SOCK_RAW) {
+- if (level = SOL_IP && sk->sk_type != SOCK_RAW) {
- if (udp_prot.compat_setsockopt != NULL)
- return udp_prot.compat_setsockopt(sk, level, optname,
- optval, optlen);
-+ if (level == SOL_IP && sk->sk_type != SOCK_RAW)
++ if (level = SOL_IP && sk->sk_type != SOCK_RAW)
return udp_prot.setsockopt(sk, level, optname, optval, optlen);
- }
@@ -241,11 +241,11 @@ index 20576e87a5f7e8..6ab44ec2c369da 100644
{
int err;
-- if (level == SOL_IP && sk->sk_type != SOCK_RAW) {
+- if (level = SOL_IP && sk->sk_type != SOCK_RAW) {
- if (udp_prot.compat_getsockopt != NULL)
- return udp_prot.compat_getsockopt(sk, level, optname,
- optval, optlen);
-+ if (level == SOL_IP && sk->sk_type != SOCK_RAW)
++ if (level = SOL_IP && sk->sk_type != SOCK_RAW)
return udp_prot.getsockopt(sk, level, optname, optval, optlen);
- }
diff --git a/a/content_digest b/N2/content_digest
index 0455dd3..cb21dbf 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 05/22] net: remove compat_sock_common_{get, set}sockopt\0"
+ "From\0Christoph Hellwig <hch\@lst.de>\0"
]
[
- "Date\0Fri, 17 Jul 2020 08:23:14 +0200\0"
+ "Subject\0[PATCH 05/22] net: remove compat_sock_common_{get,set}sockopt\0"
]
[
- "To\0mptcp at lists.01.org\0"
+ "Date\0Fri, 17 Jul 2020 06:23:14 +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 @@
"keyed of in_compat_syscall(). This allow to remove the now unused\n",
"->compat_{get,set}sockopt methods from struct proto_ops.\n",
"\n",
- "Signed-off-by: Christoph Hellwig <hch(a)lst.de>\n",
+ "Signed-off-by: Christoph Hellwig <hch\@lst.de>\n",
"---\n",
" include/linux/net.h | 6 ------\n",
" include/net/sock.h | 4 ----\n",
@@ -246,11 +271,11 @@
" {\n",
" \tint err;\n",
" \n",
- "-\tif (level == SOL_IP && sk->sk_type != SOCK_RAW) {\n",
+ "-\tif (level = SOL_IP && sk->sk_type != SOCK_RAW) {\n",
"-\t\tif (udp_prot.compat_setsockopt != NULL)\n",
"-\t\t\treturn udp_prot.compat_setsockopt(sk, level, optname,\n",
"-\t\t\t\t\t\t\t optval, optlen);\n",
- "+\tif (level == SOL_IP && sk->sk_type != SOCK_RAW)\n",
+ "+\tif (level = SOL_IP && sk->sk_type != SOCK_RAW)\n",
" \t\treturn udp_prot.setsockopt(sk, level, optname, optval, optlen);\n",
"-\t}\n",
" \n",
@@ -260,11 +285,11 @@
" {\n",
" \tint err;\n",
" \n",
- "-\tif (level == SOL_IP && sk->sk_type != SOCK_RAW) {\n",
+ "-\tif (level = SOL_IP && sk->sk_type != SOCK_RAW) {\n",
"-\t\tif (udp_prot.compat_getsockopt != NULL)\n",
"-\t\t\treturn udp_prot.compat_getsockopt(sk, level, optname,\n",
"-\t\t\t\t\t\t\t optval, optlen);\n",
- "+\tif (level == SOL_IP && sk->sk_type != SOCK_RAW)\n",
+ "+\tif (level = SOL_IP && sk->sk_type != SOCK_RAW)\n",
" \t\treturn udp_prot.getsockopt(sk, level, optname, optval, optlen);\n",
"-\t}\n",
" \n",
@@ -393,4 +418,4 @@
"2.27.0"
]
-487e4ad4a185ed4df684cf850c6ad86b88d2e3058e701d475f2ab602ff899213
+bfc3efc4370eb6a441ebf3af50b4f0167574ee2009c2ae9afda379ca588d138f
diff --git a/a/1.txt b/N3/1.txt
index 6ecb999..de5b479 100644
--- a/a/1.txt
+++ b/N3/1.txt
@@ -2,7 +2,7 @@ Add the compat handling to sock_common_{get,set}sockopt instead,
keyed of in_compat_syscall(). This allow to remove the now unused
->compat_{get,set}sockopt methods from struct proto_ops.
-Signed-off-by: Christoph Hellwig <hch(a)lst.de>
+Signed-off-by: Christoph Hellwig <hch@lst.de>
---
include/linux/net.h | 6 ------
include/net/sock.h | 4 ----
@@ -227,11 +227,11 @@ index 20576e87a5f7e8..6ab44ec2c369da 100644
{
int err;
-- if (level == SOL_IP && sk->sk_type != SOCK_RAW) {
+- if (level = SOL_IP && sk->sk_type != SOCK_RAW) {
- if (udp_prot.compat_setsockopt != NULL)
- return udp_prot.compat_setsockopt(sk, level, optname,
- optval, optlen);
-+ if (level == SOL_IP && sk->sk_type != SOCK_RAW)
++ if (level = SOL_IP && sk->sk_type != SOCK_RAW)
return udp_prot.setsockopt(sk, level, optname, optval, optlen);
- }
@@ -241,11 +241,11 @@ index 20576e87a5f7e8..6ab44ec2c369da 100644
{
int err;
-- if (level == SOL_IP && sk->sk_type != SOCK_RAW) {
+- if (level = SOL_IP && sk->sk_type != SOCK_RAW) {
- if (udp_prot.compat_getsockopt != NULL)
- return udp_prot.compat_getsockopt(sk, level, optname,
- optval, optlen);
-+ if (level == SOL_IP && sk->sk_type != SOCK_RAW)
++ if (level = SOL_IP && sk->sk_type != SOCK_RAW)
return udp_prot.getsockopt(sk, level, optname, optval, optlen);
- }
diff --git a/a/content_digest b/N3/content_digest
index 0455dd3..b48def9 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 05/22] net: remove compat_sock_common_{get, set}sockopt\0"
+ "Subject\0[PATCH 05/22] net: remove compat_sock_common_{get,set}sockopt\0"
]
[
- "Date\0Fri, 17 Jul 2020 08:23:14 +0200\0"
+ "Date\0Fri, 17 Jul 2020 06:23:14 +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 @@
"keyed of in_compat_syscall(). This allow to remove the now unused\n",
"->compat_{get,set}sockopt methods from struct proto_ops.\n",
"\n",
- "Signed-off-by: Christoph Hellwig <hch(a)lst.de>\n",
+ "Signed-off-by: Christoph Hellwig <hch\@lst.de>\n",
"---\n",
" include/linux/net.h | 6 ------\n",
" include/net/sock.h | 4 ----\n",
@@ -246,11 +246,11 @@
" {\n",
" \tint err;\n",
" \n",
- "-\tif (level == SOL_IP && sk->sk_type != SOCK_RAW) {\n",
+ "-\tif (level = SOL_IP && sk->sk_type != SOCK_RAW) {\n",
"-\t\tif (udp_prot.compat_setsockopt != NULL)\n",
"-\t\t\treturn udp_prot.compat_setsockopt(sk, level, optname,\n",
"-\t\t\t\t\t\t\t optval, optlen);\n",
- "+\tif (level == SOL_IP && sk->sk_type != SOCK_RAW)\n",
+ "+\tif (level = SOL_IP && sk->sk_type != SOCK_RAW)\n",
" \t\treturn udp_prot.setsockopt(sk, level, optname, optval, optlen);\n",
"-\t}\n",
" \n",
@@ -260,11 +260,11 @@
" {\n",
" \tint err;\n",
" \n",
- "-\tif (level == SOL_IP && sk->sk_type != SOCK_RAW) {\n",
+ "-\tif (level = SOL_IP && sk->sk_type != SOCK_RAW) {\n",
"-\t\tif (udp_prot.compat_getsockopt != NULL)\n",
"-\t\t\treturn udp_prot.compat_getsockopt(sk, level, optname,\n",
"-\t\t\t\t\t\t\t optval, optlen);\n",
- "+\tif (level == SOL_IP && sk->sk_type != SOCK_RAW)\n",
+ "+\tif (level = SOL_IP && sk->sk_type != SOCK_RAW)\n",
" \t\treturn udp_prot.getsockopt(sk, level, optname, optval, optlen);\n",
"-\t}\n",
" \n",
@@ -393,4 +393,4 @@
"2.27.0"
]
-487e4ad4a185ed4df684cf850c6ad86b88d2e3058e701d475f2ab602ff899213
+28ec15affa2c2378095d2ad505ef28e25d5ac6c47af209457846b90eb31c9616
diff --git a/a/1.txt b/N4/1.txt
index 6ecb999..b1978a8 100644
--- a/a/1.txt
+++ b/N4/1.txt
@@ -2,7 +2,7 @@ Add the compat handling to sock_common_{get,set}sockopt instead,
keyed of in_compat_syscall(). This allow to remove the now unused
->compat_{get,set}sockopt methods from struct proto_ops.
-Signed-off-by: Christoph Hellwig <hch(a)lst.de>
+Signed-off-by: Christoph Hellwig <hch@lst.de>
---
include/linux/net.h | 6 ------
include/net/sock.h | 4 ----
diff --git a/a/content_digest b/N4/content_digest
index 0455dd3..a2571a6 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 05/22] net: remove compat_sock_common_{get, set}sockopt\0"
+ "From\0Christoph Hellwig <hch\@lst.de>\0"
+]
+[
+ "Subject\0[Bridge] [PATCH 05/22] net: remove compat_sock_common_{get, set}sockopt\0"
]
[
"Date\0Fri, 17 Jul 2020 08:23:14 +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 @@
"keyed of in_compat_syscall(). This allow to remove the now unused\n",
"->compat_{get,set}sockopt methods from struct proto_ops.\n",
"\n",
- "Signed-off-by: Christoph Hellwig <hch(a)lst.de>\n",
+ "Signed-off-by: Christoph Hellwig <hch\@lst.de>\n",
"---\n",
" include/linux/net.h | 6 ------\n",
" include/net/sock.h | 4 ----\n",
@@ -393,4 +418,4 @@
"2.27.0"
]
-487e4ad4a185ed4df684cf850c6ad86b88d2e3058e701d475f2ab602ff899213
+161d304eb36bb89d2eaf02c38826710581272871fc7d8bf24cc57a4affd0b3a6
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.