diff for duplicates of <20200513062649.2100053-25-hch@lst.de>
diff --git a/a/1.txt b/N1/1.txt
index a74049f..eceb457 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -185,7 +185,7 @@ index 88aa198456858..7aaf2baf0c393 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 &&
+ IS_REACHABLE(CONFIG_IPV6)) {
+ ip6_sock_set_addr_preferences(sk,
+ IPV6_PREFER_SRC_PUBLIC);
diff --git a/a/content_digest b/N1/content_digest
index 71d7cf3..6f1e9ac 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH 24/33] ipv6: add ip6_sock_set_addr_preferences\0"
]
[
- "Date\0Wed, 13 May 2020 08:26:39 +0200\0"
+ "Date\0Wed, 13 May 2020 06:26:39 +0000\0"
]
[
"To\0David S. Miller <davem\@davemloft.net>",
@@ -233,7 +233,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 IS_REACHABLE(CONFIG_IPV6)) {\n",
"+\t\t\tip6_sock_set_addr_preferences(sk,\n",
"+\t\t\t\tIPV6_PREFER_SRC_PUBLIC);\n",
@@ -245,4 +245,4 @@
"2.26.2"
]
-2db6fd918885a4f2ee6660acd3beaa71ac875f2bcd277dbf6f33bd404a5d7f56
+0a9a69a87738c1292332b7157ee49251236423b461988cbbddd86e1ec641975f
diff --git a/a/1.txt b/N2/1.txt
index a74049f..12e30c5 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -194,4 +194,10 @@ index 88aa198456858..7aaf2baf0c393 100644
xs_tcp_set_socket_timeouts(xprt, sock);
--
-2.26.2
\ No newline at end of file
+2.26.2
+
+
+_______________________________________________
+linux-nvme mailing list
+linux-nvme@lists.infradead.org
+http://lists.infradead.org/mailman/listinfo/linux-nvme
\ No newline at end of file
diff --git a/a/content_digest b/N2/content_digest
index 71d7cf3..9e2e512 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -15,29 +15,29 @@
" 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",
+ " drbd-dev\@lists.linbit.com",
" 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",
" 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"
@@ -242,7 +242,13 @@
" \t\txs_tcp_set_socket_timeouts(xprt, sock);\n",
" \n",
"-- \n",
- "2.26.2"
+ "2.26.2\n",
+ "\n",
+ "\n",
+ "_______________________________________________\n",
+ "linux-nvme mailing list\n",
+ "linux-nvme\@lists.infradead.org\n",
+ "http://lists.infradead.org/mailman/listinfo/linux-nvme"
]
-2db6fd918885a4f2ee6660acd3beaa71ac875f2bcd277dbf6f33bd404a5d7f56
+d973c61b4c17580999142f3cfc272209243288050145f951ced79a539c74b6d6
diff --git a/a/content_digest b/N3/content_digest
index 71d7cf3..60f5bcf 100644
--- a/a/content_digest
+++ b/N3/content_digest
@@ -5,7 +5,7 @@
"From\0Christoph Hellwig <hch\@lst.de>\0"
]
[
- "Subject\0[PATCH 24/33] ipv6: add ip6_sock_set_addr_preferences\0"
+ "Subject\0[Ocfs2-devel] [PATCH 24/33] ipv6: add ip6_sock_set_addr_preferences\0"
]
[
"Date\0Wed, 13 May 2020 08:26:39 +0200\0"
@@ -245,4 +245,4 @@
"2.26.2"
]
-2db6fd918885a4f2ee6660acd3beaa71ac875f2bcd277dbf6f33bd404a5d7f56
+f4c6f49fc8e1e26f91d05c2b0b17966c190609d9bc0370ff5fd26a3e3f89f954
diff --git a/a/content_digest b/N4/content_digest
index 71d7cf3..15495f6 100644
--- a/a/content_digest
+++ b/N4/content_digest
@@ -5,39 +5,13 @@
"From\0Christoph Hellwig <hch\@lst.de>\0"
]
[
- "Subject\0[PATCH 24/33] ipv6: add ip6_sock_set_addr_preferences\0"
+ "Subject\0[Cluster-devel] [PATCH 24/33] ipv6: add ip6_sock_set_addr_preferences\0"
]
[
"Date\0Wed, 13 May 2020 08:26:39 +0200\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",
- " 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"
+ "To\0cluster-devel.redhat.com\0"
]
[
"\0000:1\0"
@@ -245,4 +219,4 @@
"2.26.2"
]
-2db6fd918885a4f2ee6660acd3beaa71ac875f2bcd277dbf6f33bd404a5d7f56
+6fb8fe94e9def68b6fbe3eb7a810228322f423b847b157b17088eb3e18b0d79f
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.