diff for duplicates of <20200513062649.2100053-34-hch@lst.de>

diff --git a/a/1.txt b/N1/1.txt
index e4568e3..5c0fad7 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -51,7 +51,7 @@ index f37c3ef508691..49000f0d87f71 100644
 -	uoptlen = (int __user __force *) optlen;
 -
 -	set_fs(KERNEL_DS);
--	if (level == SOL_SOCKET)
+-	if (level = SOL_SOCKET)
 -		err = sock_getsockopt(sock, level, optname, uoptval, uoptlen);
 -	else
 -		err = sock->ops->getsockopt(sock, level, optname, uoptval,
diff --git a/a/content_digest b/N1/content_digest
index 9449fca..922c578 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,36 +8,36 @@
   "Subject\0[PATCH 33/33] net: remove kernel_getsockopt\0"
 ]
 [
-  "Date\0Wed, 13 May 2020 08:26:48 +0200\0"
+  "Date\0Wed, 13 May 2020 06:26:48 +0000\0"
 ]
 [
   "To\0David S. Miller <davem\@davemloft.net>",
   " Jakub Kicinski <kuba\@kernel.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-block\@vger.kernel.org",
-  " linux-kernel\@vger.kernel.org",
-  " linux-rdma\@vger.kernel.org",
+  "Cc\0Marcelo Ricardo Leitner <marcelo.leitner\@gmail.com>",
+  " Eric Dumazet <edumazet\@google.com>",
   " linux-nvme\@lists.infradead.org",
+  " linux-sctp\@vger.kernel.org",
   " target-devel\@vger.kernel.org",
   " linux-afs\@lists.infradead.org",
   " linux-cifs\@vger.kernel.org",
+  " rds-devel\@oss.oracle.com",
+  " linux-rdma\@vger.kernel.org",
   " cluster-devel\@redhat.com",
-  " ocfs2-devel\@oss.oracle.com",
-  " netdev\@vger.kernel.org",
-  " linux-sctp\@vger.kernel.org",
+  " Alexey Kuznetsov <kuznet\@ms2.inr.ac.ru>",
+  " linux-block\@vger.kernel.org",
+  " drbd-dev\@tron.linbit.com",
   " ceph-devel\@vger.kernel.org",
-  " rds-devel\@oss.oracle.com",
-  " linux-nfs\@vger.kernel.org\0"
+  " linux-nfs\@vger.kernel.org",
+  " Neil Horman <nhorman\@tuxdriver.com>",
+  " Hideaki YOSHIFUJI <yoshfuji\@linux-ipv6.org>",
+  " netdev\@vger.kernel.org",
+  " Vlad Yasevich <vyasevich\@gmail.com>",
+  " linux-kernel\@vger.kernel.org",
+  " Jon Maloy <jmaloy\@redhat.com>",
+  " Ying Xue <ying.xue\@windriver.com>",
+  " ocfs2-devel\@oss.oracle.com\0"
 ]
 [
   "\0000:1\0"
@@ -99,7 +99,7 @@
   "-\tuoptlen = (int __user __force *) optlen;\n",
   "-\n",
   "-\tset_fs(KERNEL_DS);\n",
-  "-\tif (level == SOL_SOCKET)\n",
+  "-\tif (level = SOL_SOCKET)\n",
   "-\t\terr = sock_getsockopt(sock, level, optname, uoptval, uoptlen);\n",
   "-\telse\n",
   "-\t\terr = sock->ops->getsockopt(sock, level, optname, uoptval,\n",
@@ -116,4 +116,4 @@
   "2.26.2"
 ]
 
-1a71e6caf39adefb23cbd31d8d3bcc0e5c41d67c7d399c7f3c765c9ed18a1495
+7456a06ec170e07c2b87a8de01e911a5532c4064afdd5949dcef5c4ddec68203
