diff for duplicates of <20200520195509.2215098-7-hch@lst.de>

diff --git a/a/1.txt b/N1/1.txt
index 9a84718..e188472 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -20,7 +20,7 @@ index 88f2574ca63ad..b79711d0aac72 100644
  	struct socket *sock;
 -	struct __kernel_sock_timeval tv = { .tv_sec = 5, .tv_usec = 0 };
  
- 	if (con->nodeid == 0) {
+ 	if (con->nodeid = 0) {
  		log_print("attempt to connect sock 0 foiled");
 @@ -970,13 +969,10 @@ static void sctp_connect_to_sock(struct connection *con)
  	 * since O_NONBLOCK argument in connect() function does not work here,
@@ -36,7 +36,7 @@ index 88f2574ca63ad..b79711d0aac72 100644
 -			  sizeof(tv));
 +	sock_set_sndtimeo(sock->sk, 0);
  
- 	if (result == -EINPROGRESS)
+ 	if (result = -EINPROGRESS)
  		result = 0;
 diff --git a/include/net/sock.h b/include/net/sock.h
 index a3a43141a4be2..9a7b9e98685ac 100644
diff --git a/a/content_digest b/N1/content_digest
index 121e077..9bed088 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,6 +1,9 @@
 [
   "ref\00020200520195509.2215098-1-hch\@lst.de\0"
 ]
+[
+  "ref\00020200520195509.2215098-1-hch-jcswGhMUV9g\@public.gmane.org\0"
+]
 [
   "From\0Christoph Hellwig <hch\@lst.de>\0"
 ]
@@ -8,35 +11,35 @@
   "Subject\0[PATCH 06/33] net: add sock_set_sndtimeo\0"
 ]
 [
-  "Date\0Wed, 20 May 2020 21:54:42 +0200\0"
+  "Date\0Wed, 20 May 2020 19:54:42 +0000\0"
 ]
 [
-  "To\0David S. Miller <davem\@davemloft.net>",
-  " Jakub Kicinski <kuba\@kernel.org>\0"
+  "To\0David S. Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q\@public.gmane.org>",
+  " Jakub Kicinski <kuba-DgEjT+Ai2ygdnm+yROfE0A\@public.gmane.org>\0"
 ]
 [
-  "Cc\0Eric Dumazet <edumazet\@google.com>",
-  " Alexey Kuznetsov <kuznet\@ms2.inr.ac.ru>",
-  " Hideaki YOSHIFUJI <yoshfuji\@linux-ipv6.org>",
-  " Vlad Yasevich <vyasevich\@gmail.com>",
-  " Neil Horman <nhorman\@tuxdriver.com>",
-  " Marcelo Ricardo Leitner <marcelo.leitner\@gmail.com>",
-  " Jon Maloy <jmaloy\@redhat.com>",
-  " Ying Xue <ying.xue\@windriver.com>",
-  " drbd-dev\@lists.linbit.com",
-  " linux-kernel\@vger.kernel.org",
-  " linux-rdma\@vger.kernel.org",
-  " linux-nvme\@lists.infradead.org",
-  " target-devel\@vger.kernel.org",
-  " linux-afs\@lists.infradead.org",
-  " linux-cifs\@vger.kernel.org",
-  " cluster-devel\@redhat.com",
-  " ocfs2-devel\@oss.oracle.com",
-  " netdev\@vger.kernel.org",
-  " linux-sctp\@vger.kernel.org",
-  " ceph-devel\@vger.kernel.org",
-  " rds-devel\@oss.oracle.com",
-  " linux-nfs\@vger.kernel.org\0"
+  "Cc\0Marcelo Ricardo Leitner <marcelo.leitner-Re5JQEeQqe8AvxtiuMwx3w\@public.gmane.org>",
+  " Eric Dumazet <edumazet-hpIqsD4AKlfQT0dZR+AlfA\@public.gmane.org>",
+  " linux-nvme-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org",
+  " linux-sctp-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+  " target-devel-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+  " linux-afs-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org",
+  " drbd-dev-cunTk1MwBs8qoQakbn7OcQ\@public.gmane.org",
+  " linux-cifs-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+  " rds-devel-N0ozoZBvEnrZJqsBc5GL+g\@public.gmane.org",
+  " linux-rdma-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+  " cluster-devel-H+wXaHxf7aLQT0dZR+AlfA\@public.gmane.org",
+  " Alexey Kuznetsov <kuznet-v/Mj1YrvjDBInbfyfbPRSQ\@public.gmane.org>",
+  " ceph-devel-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+  " linux-nfs-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+  " Neil Horman <nhorman-2XuSBdqkA4R54TAoqtyWWQ\@public.gmane.org>",
+  " Hideaki YOSHIFUJI <yoshfuji-VfPWfsRibaP+Ru+s062T9g\@public.gmane.org>",
+  " netdev-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+  " Vlad Yasevich <vyasevich-Re5JQEeQqe8AvxtiuMwx3w\@public.gmane.org>",
+  " linux-kernel-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+  " Jon Maloy <jmaloy-H+wXaHxf7aLQT0dZR+AlfA\@public.gmane.org>",
+  " Ying Xue <ying.xue-CWA4WttNNZF54TAoqtyWWQ\@public.gmane.org>",
+  " ocfs2-devel-N0ozoZBvEnrZJqsBc5GL+g\@public.gmane.org\0"
 ]
 [
   "\0000:1\0"
@@ -67,7 +70,7 @@
   " \tstruct socket *sock;\n",
   "-\tstruct __kernel_sock_timeval tv = { .tv_sec = 5, .tv_usec = 0 };\n",
   " \n",
-  " \tif (con->nodeid == 0) {\n",
+  " \tif (con->nodeid = 0) {\n",
   " \t\tlog_print(\"attempt to connect sock 0 foiled\");\n",
   "\@\@ -970,13 +969,10 \@\@ static void sctp_connect_to_sock(struct connection *con)\n",
   " \t * since O_NONBLOCK argument in connect() function does not work here,\n",
@@ -83,7 +86,7 @@
   "-\t\t\t  sizeof(tv));\n",
   "+\tsock_set_sndtimeo(sock->sk, 0);\n",
   " \n",
-  " \tif (result == -EINPROGRESS)\n",
+  " \tif (result = -EINPROGRESS)\n",
   " \t\tresult = 0;\n",
   "diff --git a/include/net/sock.h b/include/net/sock.h\n",
   "index a3a43141a4be2..9a7b9e98685ac 100644\n",
@@ -122,4 +125,4 @@
   "2.26.2"
 ]
 
-4fcca9ade40b05c541f9037c8a0b6b6bf754c0c103a24dd55b777ce49790d5d2
+93818e013b0c5ea1b11a7f6cbf65a4512aba3fc644044522d404401632002cc0
