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

diff --git a/a/1.txt b/N1/1.txt
index 6753b79..82db250 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -175,7 +175,7 @@ index 0d3ec055bc12f..3a143e250b9ac 100644
  		 */
 -		kernel_setsockopt(sock, SOL_IPV6, IPV6_ADDR_PREFERENCES,
 -				(char *)&addr_pref, sizeof(addr_pref));
-+		if (xs_addr(xprt)->sa_family == PF_INET6) {
++		if (xs_addr(xprt)->sa_family = PF_INET6) {
 +			ip6_sock_set_addr_preferences(sk,
 +				IPV6_PREFER_SRC_PUBLIC);
 +		}
diff --git a/a/content_digest b/N1/content_digest
index 4552992..a52f408 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,35 +8,35 @@
   "Subject\0[PATCH 27/33] ipv6: add ip6_sock_set_addr_preferences\0"
 ]
 [
-  "Date\0Wed, 20 May 2020 21:55:03 +0200\0"
+  "Date\0Wed, 20 May 2020 19:55:03 +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-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>",
+  " 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"
@@ -222,7 +222,7 @@
   " \t\t */\n",
   "-\t\tkernel_setsockopt(sock, SOL_IPV6, IPV6_ADDR_PREFERENCES,\n",
   "-\t\t\t\t(char *)&addr_pref, sizeof(addr_pref));\n",
-  "+\t\tif (xs_addr(xprt)->sa_family == PF_INET6) {\n",
+  "+\t\tif (xs_addr(xprt)->sa_family = PF_INET6) {\n",
   "+\t\t\tip6_sock_set_addr_preferences(sk,\n",
   "+\t\t\t\tIPV6_PREFER_SRC_PUBLIC);\n",
   "+\t\t}\n",
@@ -233,4 +233,4 @@
   "2.26.2"
 ]
 
-ddb34e9c65f154f8c3fb1a9405f94b684aefbd95098a226aa425534140025cee
+c02e23be5e31a66b8d76b10af29dc03b86cd51f26107ef7abae1f15309277851
