diff for duplicates of <20200513062649.2100053-7-hch@lst.de>
diff --git a/a/1.txt b/N1/1.txt
index d3a60bd..c808c40 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -66,12 +66,12 @@ index 4b7439308caec..1589f242ecc7e 100644
+ break;
case SO_TIMESTAMPNS_NEW:
- if (valbool) {
-- if (optname == SO_TIMESTAMP_NEW || optname == SO_TIMESTAMPNS_NEW)
+- if (optname = SO_TIMESTAMP_NEW || optname = SO_TIMESTAMPNS_NEW)
- sock_set_flag(sk, SOCK_TSTAMP_NEW);
- else
- sock_reset_flag(sk, SOCK_TSTAMP_NEW);
-
-- if (optname == SO_TIMESTAMP_OLD || optname == SO_TIMESTAMP_NEW)
+- if (optname = SO_TIMESTAMP_OLD || optname = SO_TIMESTAMP_NEW)
- sock_reset_flag(sk, SOCK_RCVTSTAMPNS);
- else
- sock_set_flag(sk, SOCK_RCVTSTAMPNS);
diff --git a/a/content_digest b/N1/content_digest
index e14eb17..9243de5 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH 06/33] net: add sock_set_timestamps\0"
]
[
- "Date\0Wed, 13 May 2020 08:26:21 +0200\0"
+ "Date\0Wed, 13 May 2020 06:26:21 +0000\0"
]
[
"To\0David S. Miller <davem\@davemloft.net>",
@@ -114,12 +114,12 @@
"+\t\tbreak;\n",
" \tcase SO_TIMESTAMPNS_NEW:\n",
"-\t\tif (valbool) {\n",
- "-\t\t\tif (optname == SO_TIMESTAMP_NEW || optname == SO_TIMESTAMPNS_NEW)\n",
+ "-\t\t\tif (optname = SO_TIMESTAMP_NEW || optname = SO_TIMESTAMPNS_NEW)\n",
"-\t\t\t\tsock_set_flag(sk, SOCK_TSTAMP_NEW);\n",
"-\t\t\telse\n",
"-\t\t\t\tsock_reset_flag(sk, SOCK_TSTAMP_NEW);\n",
"-\n",
- "-\t\t\tif (optname == SO_TIMESTAMP_OLD || optname == SO_TIMESTAMP_NEW)\n",
+ "-\t\t\tif (optname = SO_TIMESTAMP_OLD || optname = SO_TIMESTAMP_NEW)\n",
"-\t\t\t\tsock_reset_flag(sk, SOCK_RCVTSTAMPNS);\n",
"-\t\t\telse\n",
"-\t\t\t\tsock_set_flag(sk, SOCK_RCVTSTAMPNS);\n",
@@ -159,4 +159,4 @@
"2.26.2"
]
-54ba4875db7197d2f0180a66c9f7972a5a960b34e4fc6a118a73e7ba93c6cc97
+757361b2b26ee1706139f4d495eda86eca02d42de3566deb98d00b63a468a795
diff --git a/a/1.txt b/N2/1.txt
index d3a60bd..773a9bc 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -108,4 +108,10 @@ index 01135e54d95d2..562ea36c96b0f 100644
default:
--
-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 e14eb17..87eb0b1 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"
@@ -156,7 +156,13 @@
" \n",
" \tdefault:\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"
]
-54ba4875db7197d2f0180a66c9f7972a5a960b34e4fc6a118a73e7ba93c6cc97
+e6a4922f6532807d64afede16342b6529adf6a0b0073ad8e94c8329b26f040fb
diff --git a/a/content_digest b/N3/content_digest
index e14eb17..b479dc8 100644
--- a/a/content_digest
+++ b/N3/content_digest
@@ -5,7 +5,7 @@
"From\0Christoph Hellwig <hch\@lst.de>\0"
]
[
- "Subject\0[PATCH 06/33] net: add sock_set_timestamps\0"
+ "Subject\0[Ocfs2-devel] [PATCH 06/33] net: add sock_set_timestamps\0"
]
[
"Date\0Wed, 13 May 2020 08:26:21 +0200\0"
@@ -159,4 +159,4 @@
"2.26.2"
]
-54ba4875db7197d2f0180a66c9f7972a5a960b34e4fc6a118a73e7ba93c6cc97
+b9d63a35a15f3c92d958e59125a013ca1860de2938af14a44a44bba1911c9a37
diff --git a/a/content_digest b/N4/content_digest
index e14eb17..f68c20e 100644
--- a/a/content_digest
+++ b/N4/content_digest
@@ -5,39 +5,13 @@
"From\0Christoph Hellwig <hch\@lst.de>\0"
]
[
- "Subject\0[PATCH 06/33] net: add sock_set_timestamps\0"
+ "Subject\0[Cluster-devel] [PATCH 06/33] net: add sock_set_timestamps\0"
]
[
"Date\0Wed, 13 May 2020 08:26:21 +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"
@@ -159,4 +133,4 @@
"2.26.2"
]
-54ba4875db7197d2f0180a66c9f7972a5a960b34e4fc6a118a73e7ba93c6cc97
+2531135cd2408e31707711e1bec361c740d31024ce88d6f5a77eb2f8d8585fe8
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.