diff for duplicates of <20181119200625.GA24261@splinter> diff --git a/a/1.txt b/N1/1.txt index 00e0877..a8729b5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,4 +1,4 @@ -On Mon, Nov 19, 2018 at 11:07:45AM -0800, David Miller wrote: +On Mon, Nov 19, 2018@11:07:45AM -0800, David Miller wrote: > From: Ido Schimmel <idosch at mellanox.com> > Date: Mon, 19 Nov 2018 16:11:07 +0000 > diff --git a/a/content_digest b/N1/content_digest index d2a5179..fb3848b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,12 +1,12 @@ "ref\020181119161006.5405-1-idosch@mellanox.com\0" "ref\020181119161006.5405-2-idosch@mellanox.com\0" "ref\020181119.110745.12820215456503449.davem@davemloft.net\0" - "From\0idosch at idosch.org (Ido Schimmel)\0" + "From\0idosch@idosch.org (Ido Schimmel)\0" "Subject\0[PATCH net-next 01/18] net: skb_scrub_packet(): Scrub offload_fwd_mark\0" "Date\0Mon, 19 Nov 2018 22:06:25 +0200\0" "\00:1\0" "b\0" - "On Mon, Nov 19, 2018 at 11:07:45AM -0800, David Miller wrote:\n" + "On Mon, Nov 19, 2018@11:07:45AM -0800, David Miller wrote:\n" "> From: Ido Schimmel <idosch at mellanox.com>\n" "> Date: Mon, 19 Nov 2018 16:11:07 +0000\n" "> \n" @@ -41,4 +41,4 @@ "\n" Thanks for the feedback -3b97f9d6954ca778a970ba449ba12771961243f5682540b7b7b740deeb32fcef +de9949eb72d369e0af170007bd84286bb6143ed311d819b1519b53bc78dbe811
diff --git a/a/1.txt b/N2/1.txt index 00e0877..563caa4 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,8 +1,8 @@ On Mon, Nov 19, 2018 at 11:07:45AM -0800, David Miller wrote: -> From: Ido Schimmel <idosch at mellanox.com> +> From: Ido Schimmel <idosch@mellanox.com> > Date: Mon, 19 Nov 2018 16:11:07 +0000 > -> > From: Petr Machata <petrm at mellanox.com> +> > From: Petr Machata <petrm@mellanox.com> > > > > When a packet is trapped and the corresponding SKB marked as > > already-forwarded, it retains this marking even after it is forwarded @@ -20,9 +20,9 @@ On Mon, Nov 19, 2018 at 11:07:45AM -0800, David Miller wrote: > > cases where traffic is forwarded between bridges and transformed in a > > way that invalidates the marking. > > -> > Signed-off-by: Petr Machata <petrm at mellanox.com> -> > Suggested-by: Ido Schimmel <idosch at mellanox.com> -> > Signed-off-by: Ido Schimmel <idosch at mellanox.com> +> > Signed-off-by: Petr Machata <petrm@mellanox.com> +> > Suggested-by: Ido Schimmel <idosch@mellanox.com> +> > Signed-off-by: Ido Schimmel <idosch@mellanox.com> > > As a bug fix this seems relevant for 'net' instead of 'net-next'. diff --git a/a/content_digest b/N2/content_digest index d2a5179..909fa56 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,16 +1,25 @@ "ref\020181119161006.5405-1-idosch@mellanox.com\0" "ref\020181119161006.5405-2-idosch@mellanox.com\0" "ref\020181119.110745.12820215456503449.davem@davemloft.net\0" - "From\0idosch at idosch.org (Ido Schimmel)\0" - "Subject\0[PATCH net-next 01/18] net: skb_scrub_packet(): Scrub offload_fwd_mark\0" + "From\0Ido Schimmel <idosch@idosch.org>\0" + "Subject\0Re: [PATCH net-next 01/18] net: skb_scrub_packet(): Scrub offload_fwd_mark\0" "Date\0Mon, 19 Nov 2018 22:06:25 +0200\0" + "To\0David Miller <davem@davemloft.net>\0" + "Cc\0idosch@mellanox.com" + netdev@vger.kernel.org + linux-kselftest@vger.kernel.org + shuah@kernel.org + jiri@mellanox.com + petrm@mellanox.com + roopa@cumulusnetworks.com + " mlxsw@mellanox.com\0" "\00:1\0" "b\0" "On Mon, Nov 19, 2018 at 11:07:45AM -0800, David Miller wrote:\n" - "> From: Ido Schimmel <idosch at mellanox.com>\n" + "> From: Ido Schimmel <idosch@mellanox.com>\n" "> Date: Mon, 19 Nov 2018 16:11:07 +0000\n" "> \n" - "> > From: Petr Machata <petrm at mellanox.com>\n" + "> > From: Petr Machata <petrm@mellanox.com>\n" "> > \n" "> > When a packet is trapped and the corresponding SKB marked as\n" "> > already-forwarded, it retains this marking even after it is forwarded\n" @@ -28,9 +37,9 @@ "> > cases where traffic is forwarded between bridges and transformed in a\n" "> > way that invalidates the marking.\n" "> > \n" - "> > Signed-off-by: Petr Machata <petrm at mellanox.com>\n" - "> > Suggested-by: Ido Schimmel <idosch at mellanox.com>\n" - "> > Signed-off-by: Ido Schimmel <idosch at mellanox.com>\n" + "> > Signed-off-by: Petr Machata <petrm@mellanox.com>\n" + "> > Suggested-by: Ido Schimmel <idosch@mellanox.com>\n" + "> > Signed-off-by: Ido Schimmel <idosch@mellanox.com>\n" "> \n" "> As a bug fix this seems relevant for 'net' instead of 'net-next'.\n" "\n" @@ -41,4 +50,4 @@ "\n" Thanks for the feedback -3b97f9d6954ca778a970ba449ba12771961243f5682540b7b7b740deeb32fcef +188c119d32212bbaccfec6588bbe3c42d9dbe5009ffc3666bab96844f018624c
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.