diff for duplicates of <20200513062649.2100053-2-hch@lst.de>
diff --git a/a/1.txt b/N1/1.txt
index d0141df..7129b8a 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -26,7 +26,7 @@ index 559e5fd3bad8b..6d7c8c933736c 100644
{
- int rv, flags = 0, s_val = 1;
+ int rv, flags = 0;
- size_t size = laddr->sa_family == AF_INET ?
+ size_t size = laddr->sa_family = AF_INET ?
sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6);
/*
@@ -62,7 +62,7 @@ index 559e5fd3bad8b..6d7c8c933736c 100644
- }
+ sock_set_reuseaddr(s->sk, SK_CAN_REUSE);
+
- if (addr_family == AF_INET) {
+ if (addr_family = AF_INET) {
struct sockaddr_in *laddr = &to_sockaddr_in(id->local_addr);
diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c
diff --git a/a/content_digest b/N1/content_digest
index 05bd53d..e13f700 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH 01/33] net: add sock_set_reuseaddr\0"
]
[
- "Date\0Wed, 13 May 2020 08:26:16 +0200\0"
+ "Date\0Wed, 13 May 2020 06:26:16 +0000\0"
]
[
"To\0David S. Miller <davem\@davemloft.net>",
@@ -74,7 +74,7 @@
" {\n",
"-\tint rv, flags = 0, s_val = 1;\n",
"+\tint rv, flags = 0;\n",
- " \tsize_t size = laddr->sa_family == AF_INET ?\n",
+ " \tsize_t size = laddr->sa_family = AF_INET ?\n",
" \t\tsizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6);\n",
" \n",
" \t/*\n",
@@ -110,7 +110,7 @@
"-\t}\n",
"+\tsock_set_reuseaddr(s->sk, SK_CAN_REUSE);\n",
"+\n",
- " \tif (addr_family == AF_INET) {\n",
+ " \tif (addr_family = AF_INET) {\n",
" \t\tstruct sockaddr_in *laddr = &to_sockaddr_in(id->local_addr);\n",
" \n",
"diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c\n",
@@ -224,4 +224,4 @@
"2.26.2"
]
-65aa312ff7025c0fe9e9c408c9a5e35870b7b9782d6cfd109601d78f9932e37c
+8015a267f5f2270ad3b4fe457c7649e67a557c2e77ec5d06a18faeac4c74117f
diff --git a/a/1.txt b/N2/1.txt
index d0141df..a941121 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -173,4 +173,10 @@ index fd85e651ce284..ff4faa3e68ac4 100644
* This is meant for all protocols to use and covers goings on
* at the socket level. Everything here is generic.
--
-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 05bd53d..2ffeb43 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"
@@ -221,7 +221,13 @@
" *\tThis is meant for all protocols to use and covers goings on\n",
" *\tat the socket level. Everything here is generic.\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"
]
-65aa312ff7025c0fe9e9c408c9a5e35870b7b9782d6cfd109601d78f9932e37c
+33140c63c2b878dd0a32d4b3b1bd24cef4bc0c1addfb751e300fe1e630cf0c04
diff --git a/a/content_digest b/N3/content_digest
index 05bd53d..09d2f50 100644
--- a/a/content_digest
+++ b/N3/content_digest
@@ -5,7 +5,7 @@
"From\0Christoph Hellwig <hch\@lst.de>\0"
]
[
- "Subject\0[PATCH 01/33] net: add sock_set_reuseaddr\0"
+ "Subject\0[Ocfs2-devel] [PATCH 01/33] net: add sock_set_reuseaddr\0"
]
[
"Date\0Wed, 13 May 2020 08:26:16 +0200\0"
@@ -224,4 +224,4 @@
"2.26.2"
]
-65aa312ff7025c0fe9e9c408c9a5e35870b7b9782d6cfd109601d78f9932e37c
+b57f5b87f15357cc8f4ac8602c1ff5feed62edfc13b0e79639965a60baa24540
diff --git a/a/content_digest b/N4/content_digest
index 05bd53d..a8b58a3 100644
--- a/a/content_digest
+++ b/N4/content_digest
@@ -5,39 +5,13 @@
"From\0Christoph Hellwig <hch\@lst.de>\0"
]
[
- "Subject\0[PATCH 01/33] net: add sock_set_reuseaddr\0"
+ "Subject\0[Cluster-devel] [PATCH 01/33] net: add sock_set_reuseaddr\0"
]
[
"Date\0Wed, 13 May 2020 08:26:16 +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"
@@ -224,4 +198,4 @@
"2.26.2"
]
-65aa312ff7025c0fe9e9c408c9a5e35870b7b9782d6cfd109601d78f9932e37c
+9bded4b5b6c4cd9b65e880db9b837edfc59923c13004d820ebed7d19eeff0d92
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.