diff for duplicates of <20200723060908.50081-25-hch@lst.de>
diff --git a/a/1.txt b/N1/1.txt
index 463128c..acb53dd 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,7 +1,7 @@
Pass a sockptr_t to prepare for set_fs-less handling of the kernel
pointer from bpf-cgroup.
-Signed-off-by: Christoph Hellwig <hch(a)lst.de>
+Signed-off-by: Christoph Hellwig <hch@lst.de>
---
net/ipv4/tcp.c | 34 ++++++++++++++++------------------
1 file changed, 16 insertions(+), 18 deletions(-)
diff --git a/a/content_digest b/N1/content_digest
index cb4da79..2bbce5b 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,17 +1,49 @@
[
- "From\0Christoph Hellwig <hch at lst.de>\0"
+ "ref\00020200723060908.50081-1-hch\@lst.de\0"
]
[
- "Subject\0[MPTCP] [PATCH 24/26] net/tcp: switch do_tcp_setsockopt to sockptr_t\0"
+ "From\0Christoph Hellwig <hch\@lst.de>\0"
+]
+[
+ "Subject\0[PATCH 24/26] net/tcp: switch do_tcp_setsockopt to sockptr_t\0"
]
[
"Date\0Thu, 23 Jul 2020 08:09:06 +0200\0"
]
[
- "To\0mptcp at lists.01.org\0"
+ "To\0David S. Miller <davem\@davemloft.net>",
+ " Jakub Kicinski <kuba\@kernel.org>",
+ " Alexei Starovoitov <ast\@kernel.org>",
+ " Daniel Borkmann <daniel\@iogearbox.net>",
+ " Alexey Kuznetsov <kuznet\@ms2.inr.ac.ru>",
+ " Hideaki YOSHIFUJI <yoshfuji\@linux-ipv6.org>",
+ " Eric Dumazet <edumazet\@google.com>\0"
+]
+[
+ "Cc\0linux-crypto\@vger.kernel.org",
+ " linux-kernel\@vger.kernel.org",
+ " netdev\@vger.kernel.org",
+ " bpf\@vger.kernel.org",
+ " netfilter-devel\@vger.kernel.org",
+ " coreteam\@netfilter.org",
+ " linux-sctp\@vger.kernel.org",
+ " linux-hams\@vger.kernel.org",
+ " linux-bluetooth\@vger.kernel.org",
+ " bridge\@lists.linux-foundation.org",
+ " linux-can\@vger.kernel.org",
+ " dccp\@vger.kernel.org",
+ " linux-decnet-user\@lists.sourceforge.net",
+ " linux-wpan\@vger.kernel.org",
+ " linux-s390\@vger.kernel.org",
+ " mptcp\@lists.01.org",
+ " lvs-devel\@vger.kernel.org",
+ " rds-devel\@oss.oracle.com",
+ " linux-afs\@lists.infradead.org",
+ " tipc-discussion\@lists.sourceforge.net",
+ " linux-x25\@vger.kernel.org\0"
]
[
- "\0001:1\0"
+ "\0000:1\0"
]
[
"b\0"
@@ -20,7 +52,7 @@
"Pass a sockptr_t to prepare for set_fs-less handling of the kernel\n",
"pointer from bpf-cgroup.\n",
"\n",
- "Signed-off-by: Christoph Hellwig <hch(a)lst.de>\n",
+ "Signed-off-by: Christoph Hellwig <hch\@lst.de>\n",
"---\n",
" net/ipv4/tcp.c | 34 ++++++++++++++++------------------\n",
" 1 file changed, 16 insertions(+), 18 deletions(-)\n",
@@ -151,4 +183,4 @@
"2.27.0"
]
-91766103ff26d0809769be656dbf4b063b07cd42184a349f73d5618c578f793f
+853c8974aaf76b617009c98b0dc92cc2ec4917c226ad5a469925ad0f16aa2c20
diff --git a/a/1.txt b/N2/1.txt
index 463128c..534314d 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -1,7 +1,7 @@
Pass a sockptr_t to prepare for set_fs-less handling of the kernel
pointer from bpf-cgroup.
-Signed-off-by: Christoph Hellwig <hch(a)lst.de>
+Signed-off-by: Christoph Hellwig <hch@lst.de>
---
net/ipv4/tcp.c | 34 ++++++++++++++++------------------
1 file changed, 16 insertions(+), 18 deletions(-)
@@ -87,7 +87,7 @@ index 49bf15c27deac7..71cbc61c335f71 100644
+ if (copy_from_sockptr(key, optval, optlen))
return -EFAULT;
- if (optlen == TCP_FASTOPEN_KEY_BUF_LENGTH)
+ if (optlen = TCP_FASTOPEN_KEY_BUF_LENGTH)
@@ -3095,7 +3095,7 @@ static int do_tcp_setsockopt(struct sock *sk, int level,
if (optlen < sizeof(int))
return -EINVAL;
@@ -100,7 +100,7 @@ index 49bf15c27deac7..71cbc61c335f71 100644
@@ -3174,9 +3174,7 @@ static int do_tcp_setsockopt(struct sock *sk, int level,
if (!tp->repair)
err = -EINVAL;
- else if (sk->sk_state == TCP_ESTABLISHED)
+ else if (sk->sk_state = TCP_ESTABLISHED)
- err = tcp_repair_options_est(sk,
- (struct tcp_repair_opt __user *)optval,
- optlen);
diff --git a/a/content_digest b/N2/content_digest
index cb4da79..171bb8b 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -1,17 +1,49 @@
[
- "From\0Christoph Hellwig <hch at lst.de>\0"
+ "ref\00020200723060908.50081-1-hch\@lst.de\0"
]
[
- "Subject\0[MPTCP] [PATCH 24/26] net/tcp: switch do_tcp_setsockopt to sockptr_t\0"
+ "From\0Christoph Hellwig <hch\@lst.de>\0"
]
[
- "Date\0Thu, 23 Jul 2020 08:09:06 +0200\0"
+ "Subject\0[PATCH 24/26] net/tcp: switch do_tcp_setsockopt to sockptr_t\0"
]
[
- "To\0mptcp at lists.01.org\0"
+ "Date\0Thu, 23 Jul 2020 06:09:06 +0000\0"
]
[
- "\0001:1\0"
+ "To\0David S. Miller <davem\@davemloft.net>",
+ " Jakub Kicinski <kuba\@kernel.org>",
+ " Alexei Starovoitov <ast\@kernel.org>",
+ " Daniel Borkmann <daniel\@iogearbox.net>",
+ " Alexey Kuznetsov <kuznet\@ms2.inr.ac.ru>",
+ " Hideaki YOSHIFUJI <yoshfuji\@linux-ipv6.org>",
+ " Eric Dumazet <edumazet\@google.com>\0"
+]
+[
+ "Cc\0linux-crypto\@vger.kernel.org",
+ " linux-kernel\@vger.kernel.org",
+ " netdev\@vger.kernel.org",
+ " bpf\@vger.kernel.org",
+ " netfilter-devel\@vger.kernel.org",
+ " coreteam\@netfilter.org",
+ " linux-sctp\@vger.kernel.org",
+ " linux-hams\@vger.kernel.org",
+ " linux-bluetooth\@vger.kernel.org",
+ " bridge\@lists.linux-foundation.org",
+ " linux-can\@vger.kernel.org",
+ " dccp\@vger.kernel.org",
+ " linux-decnet-user\@lists.sourceforge.net",
+ " linux-wpan\@vger.kernel.org",
+ " linux-s390\@vger.kernel.org",
+ " mptcp\@lists.01.org",
+ " lvs-devel\@vger.kernel.org",
+ " rds-devel\@oss.oracle.com",
+ " linux-afs\@lists.infradead.org",
+ " tipc-discussion\@lists.sourceforge.net",
+ " linux-x25\@vger.kernel.org\0"
+]
+[
+ "\0000:1\0"
]
[
"b\0"
@@ -20,7 +52,7 @@
"Pass a sockptr_t to prepare for set_fs-less handling of the kernel\n",
"pointer from bpf-cgroup.\n",
"\n",
- "Signed-off-by: Christoph Hellwig <hch(a)lst.de>\n",
+ "Signed-off-by: Christoph Hellwig <hch\@lst.de>\n",
"---\n",
" net/ipv4/tcp.c | 34 ++++++++++++++++------------------\n",
" 1 file changed, 16 insertions(+), 18 deletions(-)\n",
@@ -106,7 +138,7 @@
"+\t\tif (copy_from_sockptr(key, optval, optlen))\n",
" \t\t\treturn -EFAULT;\n",
" \n",
- " \t\tif (optlen == TCP_FASTOPEN_KEY_BUF_LENGTH)\n",
+ " \t\tif (optlen = TCP_FASTOPEN_KEY_BUF_LENGTH)\n",
"\@\@ -3095,7 +3095,7 \@\@ static int do_tcp_setsockopt(struct sock *sk, int level,\n",
" \tif (optlen < sizeof(int))\n",
" \t\treturn -EINVAL;\n",
@@ -119,7 +151,7 @@
"\@\@ -3174,9 +3174,7 \@\@ static int do_tcp_setsockopt(struct sock *sk, int level,\n",
" \t\tif (!tp->repair)\n",
" \t\t\terr = -EINVAL;\n",
- " \t\telse if (sk->sk_state == TCP_ESTABLISHED)\n",
+ " \t\telse if (sk->sk_state = TCP_ESTABLISHED)\n",
"-\t\t\terr = tcp_repair_options_est(sk,\n",
"-\t\t\t\t\t(struct tcp_repair_opt __user *)optval,\n",
"-\t\t\t\t\toptlen);\n",
@@ -151,4 +183,4 @@
"2.27.0"
]
-91766103ff26d0809769be656dbf4b063b07cd42184a349f73d5618c578f793f
+93a6ec485bf71814d0c2ddea3ba6d9e07ddd89fb23ca721ec5bbbe5a91d9d9fa
diff --git a/a/1.txt b/N3/1.txt
index 463128c..534314d 100644
--- a/a/1.txt
+++ b/N3/1.txt
@@ -1,7 +1,7 @@
Pass a sockptr_t to prepare for set_fs-less handling of the kernel
pointer from bpf-cgroup.
-Signed-off-by: Christoph Hellwig <hch(a)lst.de>
+Signed-off-by: Christoph Hellwig <hch@lst.de>
---
net/ipv4/tcp.c | 34 ++++++++++++++++------------------
1 file changed, 16 insertions(+), 18 deletions(-)
@@ -87,7 +87,7 @@ index 49bf15c27deac7..71cbc61c335f71 100644
+ if (copy_from_sockptr(key, optval, optlen))
return -EFAULT;
- if (optlen == TCP_FASTOPEN_KEY_BUF_LENGTH)
+ if (optlen = TCP_FASTOPEN_KEY_BUF_LENGTH)
@@ -3095,7 +3095,7 @@ static int do_tcp_setsockopt(struct sock *sk, int level,
if (optlen < sizeof(int))
return -EINVAL;
@@ -100,7 +100,7 @@ index 49bf15c27deac7..71cbc61c335f71 100644
@@ -3174,9 +3174,7 @@ static int do_tcp_setsockopt(struct sock *sk, int level,
if (!tp->repair)
err = -EINVAL;
- else if (sk->sk_state == TCP_ESTABLISHED)
+ else if (sk->sk_state = TCP_ESTABLISHED)
- err = tcp_repair_options_est(sk,
- (struct tcp_repair_opt __user *)optval,
- optlen);
diff --git a/a/content_digest b/N3/content_digest
index cb4da79..4dc4591 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 24/26] net/tcp: switch do_tcp_setsockopt to sockptr_t\0"
+ "Subject\0[PATCH 24/26] net/tcp: switch do_tcp_setsockopt to sockptr_t\0"
]
[
- "Date\0Thu, 23 Jul 2020 08:09:06 +0200\0"
+ "Date\0Thu, 23 Jul 2020 06:09:06 +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 @@
"Pass a sockptr_t to prepare for set_fs-less handling of the kernel\n",
"pointer from bpf-cgroup.\n",
"\n",
- "Signed-off-by: Christoph Hellwig <hch(a)lst.de>\n",
+ "Signed-off-by: Christoph Hellwig <hch\@lst.de>\n",
"---\n",
" net/ipv4/tcp.c | 34 ++++++++++++++++------------------\n",
" 1 file changed, 16 insertions(+), 18 deletions(-)\n",
@@ -106,7 +106,7 @@
"+\t\tif (copy_from_sockptr(key, optval, optlen))\n",
" \t\t\treturn -EFAULT;\n",
" \n",
- " \t\tif (optlen == TCP_FASTOPEN_KEY_BUF_LENGTH)\n",
+ " \t\tif (optlen = TCP_FASTOPEN_KEY_BUF_LENGTH)\n",
"\@\@ -3095,7 +3095,7 \@\@ static int do_tcp_setsockopt(struct sock *sk, int level,\n",
" \tif (optlen < sizeof(int))\n",
" \t\treturn -EINVAL;\n",
@@ -119,7 +119,7 @@
"\@\@ -3174,9 +3174,7 \@\@ static int do_tcp_setsockopt(struct sock *sk, int level,\n",
" \t\tif (!tp->repair)\n",
" \t\t\terr = -EINVAL;\n",
- " \t\telse if (sk->sk_state == TCP_ESTABLISHED)\n",
+ " \t\telse if (sk->sk_state = TCP_ESTABLISHED)\n",
"-\t\t\terr = tcp_repair_options_est(sk,\n",
"-\t\t\t\t\t(struct tcp_repair_opt __user *)optval,\n",
"-\t\t\t\t\toptlen);\n",
@@ -151,4 +151,4 @@
"2.27.0"
]
-91766103ff26d0809769be656dbf4b063b07cd42184a349f73d5618c578f793f
+b18cb852bc46fd774b48eb55913c9c9ec8c8cf512e25d81dc4fe8d0b24574d4d
diff --git a/a/1.txt b/N4/1.txt
index 463128c..acb53dd 100644
--- a/a/1.txt
+++ b/N4/1.txt
@@ -1,7 +1,7 @@
Pass a sockptr_t to prepare for set_fs-less handling of the kernel
pointer from bpf-cgroup.
-Signed-off-by: Christoph Hellwig <hch(a)lst.de>
+Signed-off-by: Christoph Hellwig <hch@lst.de>
---
net/ipv4/tcp.c | 34 ++++++++++++++++------------------
1 file changed, 16 insertions(+), 18 deletions(-)
diff --git a/a/content_digest b/N4/content_digest
index cb4da79..c93e839 100644
--- a/a/content_digest
+++ b/N4/content_digest
@@ -1,17 +1,49 @@
[
- "From\0Christoph Hellwig <hch at lst.de>\0"
+ "ref\00020200723060908.50081-1-hch\@lst.de\0"
]
[
- "Subject\0[MPTCP] [PATCH 24/26] net/tcp: switch do_tcp_setsockopt to sockptr_t\0"
+ "From\0Christoph Hellwig <hch\@lst.de>\0"
+]
+[
+ "Subject\0[Bridge] [PATCH 24/26] net/tcp: switch do_tcp_setsockopt to sockptr_t\0"
]
[
"Date\0Thu, 23 Jul 2020 08:09:06 +0200\0"
]
[
- "To\0mptcp at lists.01.org\0"
+ "To\0David S. Miller <davem\@davemloft.net>",
+ " Jakub Kicinski <kuba\@kernel.org>",
+ " Alexei Starovoitov <ast\@kernel.org>",
+ " Daniel Borkmann <daniel\@iogearbox.net>",
+ " Alexey Kuznetsov <kuznet\@ms2.inr.ac.ru>",
+ " Hideaki YOSHIFUJI <yoshfuji\@linux-ipv6.org>",
+ " Eric Dumazet <edumazet\@google.com>\0"
+]
+[
+ "Cc\0linux-s390\@vger.kernel.org",
+ " rds-devel\@oss.oracle.com",
+ " linux-decnet-user\@lists.sourceforge.net",
+ " tipc-discussion\@lists.sourceforge.net",
+ " linux-x25\@vger.kernel.org",
+ " dccp\@vger.kernel.org",
+ " netdev\@vger.kernel.org",
+ " bridge\@lists.linux-foundation.org",
+ " linux-kernel\@vger.kernel.org",
+ " linux-can\@vger.kernel.org",
+ " lvs-devel\@vger.kernel.org",
+ " linux-bluetooth\@vger.kernel.org",
+ " linux-sctp\@vger.kernel.org",
+ " coreteam\@netfilter.org",
+ " netfilter-devel\@vger.kernel.org",
+ " linux-crypto\@vger.kernel.org",
+ " linux-hams\@vger.kernel.org",
+ " bpf\@vger.kernel.org",
+ " linux-wpan\@vger.kernel.org",
+ " linux-afs\@lists.infradead.org",
+ " mptcp\@lists.01.org\0"
]
[
- "\0001:1\0"
+ "\0000:1\0"
]
[
"b\0"
@@ -20,7 +52,7 @@
"Pass a sockptr_t to prepare for set_fs-less handling of the kernel\n",
"pointer from bpf-cgroup.\n",
"\n",
- "Signed-off-by: Christoph Hellwig <hch(a)lst.de>\n",
+ "Signed-off-by: Christoph Hellwig <hch\@lst.de>\n",
"---\n",
" net/ipv4/tcp.c | 34 ++++++++++++++++------------------\n",
" 1 file changed, 16 insertions(+), 18 deletions(-)\n",
@@ -151,4 +183,4 @@
"2.27.0"
]
-91766103ff26d0809769be656dbf4b063b07cd42184a349f73d5618c578f793f
+9a45d6a4c8ae69fa058e1c2825e548651fc63be13d9548c61c0d65dc4d9afac9
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.