diff for duplicates of <1520391209.109662.33.camel@gmail.com>
diff --git a/a/1.txt b/N1/1.txt
index 6935d7e..2725b09 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -9,15 +9,15 @@ On Tue, 2018-03-06 at 17:12 -0800, Jesus Sanchez-Palencia wrote:
* --- a/include/linux/skbuff.h
* +++ b/include/linux/skbuff.h
* @@ -788,6 +788,9 @@ struct sk_buff {
- * __u8 tc_redirected:1;
- * __u8 tc_from_ingress:1;
- * #endif
+ * ? __u8 tc_redirected:1;
+ * ? __u8 tc_from_ingress:1;
+ * ?#endif
* + __u8 tc_drop_if_late:1;
* +
* + clockid_t txtime_clockid;
- *
- * #ifdef CONFIG_NET_SCHED
- * __u16 tc_index; /* traffic
+ * ?
+ * ?#ifdef CONFIG_NET_SCHED
+ * ? __u16 tc_index; /* traffic
control index */
diff --git a/a/content_digest b/N1/content_digest
index d4f1742..c49b34d 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,30 +8,13 @@
"From\0Eric Dumazet <eric.dumazet\@gmail.com>\0"
]
[
- "Subject\0Re: [RFC v3 net-next 08/18] net: SO_TXTIME: Add clockid and drop_if_late params\0"
+ "Subject\0[Intel-wired-lan] [RFC v3 net-next 08/18] net: SO_TXTIME: Add clockid and drop_if_late params\0"
]
[
"Date\0Tue, 06 Mar 2018 18:53:29 -0800\0"
]
[
- "To\0Jesus Sanchez-Palencia <jesus.sanchez-palencia\@intel.com>",
- " netdev\@vger.kernel.org\0"
-]
-[
- "Cc\0jhs\@mojatatu.com",
- " xiyou.wangcong\@gmail.com",
- " jiri\@resnulli.us",
- " vinicius.gomes\@intel.com",
- " richardcochran\@gmail.com",
- " intel-wired-lan\@lists.osuosl.org",
- " anna-maria\@linutronix.de",
- " henrik\@austad.us",
- " tglx\@linutronix.de",
- " john.stultz\@linaro.org",
- " levi.pearson\@harman.com",
- " edumazet\@google.com",
- " willemb\@google.com",
- " mlichvar\@redhat.com\0"
+ "To\0intel-wired-lan\@osuosl.org\0"
]
[
"\0000:1\0"
@@ -51,15 +34,15 @@
" * --- a/include/linux/skbuff.h\n",
" * +++ b/include/linux/skbuff.h\n",
" * \@\@ -788,6 +788,9 \@\@ struct sk_buff {\n",
- " * \302\240\t__u8\t\t\ttc_redirected:1;\n",
- " * \302\240\t__u8\t\t\ttc_from_ingress:1;\n",
- " * \302\240#endif\n",
+ " * ?\t__u8\t\t\ttc_redirected:1;\n",
+ " * ?\t__u8\t\t\ttc_from_ingress:1;\n",
+ " * ?#endif\n",
" * +\t__u8\t\t\ttc_drop_if_late:1;\n",
" * +\n",
" * +\tclockid_t\t\ttxtime_clockid;\n",
- " * \302\240\n",
- " * \302\240#ifdef CONFIG_NET_SCHED\n",
- " * \302\240\t__u16\t\t\ttc_index;\t/* traffic\n",
+ " * ?\n",
+ " * ?#ifdef CONFIG_NET_SCHED\n",
+ " * ?\t__u16\t\t\ttc_index;\t/* traffic\n",
" control index */\n",
"\n",
"\n",
@@ -69,4 +52,4 @@
"Do we really need 32 bits for a clockid_t ?"
]
-ccc509cc524845120a6481d2b3fd315f907c90c32bc2768145cc8555cb62c783
+e81a8bcb21f577b3114b2263dc164bdc9689bef45741a39b338e878921ee9386
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.