diff for duplicates of <20200727161555.GA7817@lst.de> diff --git a/a/content_digest b/N1/content_digest index fbc902c..71433c3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,38 +4,38 @@ "ref\020200727130029.GA26393@lst.de\0" "ref\020200727133331.GA1851348@shredder\0" "From\0Christoph Hellwig <hch@lst.de>\0" - "Subject\0Re: [PATCH 19/26] net/ipv6: switch ipv6_flowlabel_opt to sockptr_t\0" + "Subject\0Re: [Bridge] [PATCH 19/26] net/ipv6: switch ipv6_flowlabel_opt to sockptr_t\0" "Date\0Mon, 27 Jul 2020 18:15:55 +0200\0" "To\0Ido Schimmel <idosch@idosch.org>\0" - "Cc\0Christoph Hellwig <hch@lst.de>" - David S. Miller <davem@davemloft.net> - Jakub Kicinski <kuba@kernel.org> - Alexei Starovoitov <ast@kernel.org> + "Cc\0Alexei Starovoitov <ast@kernel.org>" + linux-sctp@vger.kernel.org + Christoph Hellwig <hch@lst.de> + linux-s390@vger.kernel.org + rds-devel@oss.oracle.com Daniel Borkmann <daniel@iogearbox.net> + dccp@vger.kernel.org + bridge@lists.linux-foundation.org + linux-afs@lists.infradead.org + lvs-devel@vger.kernel.org + coreteam@netfilter.org + mptcp@lists.01.org Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> - Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> + linux-can@vger.kernel.org + Jakub Kicinski <kuba@kernel.org> + linux-hams@vger.kernel.org + tipc-discussion@lists.sourceforge.net + linux-x25@vger.kernel.org Eric Dumazet <edumazet@google.com> - linux-crypto@vger.kernel.org - linux-kernel@vger.kernel.org + Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> netdev@vger.kernel.org - bpf@vger.kernel.org - netfilter-devel@vger.kernel.org - coreteam@netfilter.org - linux-sctp@vger.kernel.org - linux-hams@vger.kernel.org - linux-bluetooth@vger.kernel.org - bridge@lists.linux-foundation.org - linux-can@vger.kernel.org - dccp@vger.kernel.org linux-decnet-user@lists.sourceforge.net + linux-kernel@vger.kernel.org + linux-bluetooth@vger.kernel.org + netfilter-devel@vger.kernel.org + linux-crypto@vger.kernel.org + bpf@vger.kernel.org linux-wpan@vger.kernel.org - linux-s390@vger.kernel.org - mptcp@lists.01.org - lvs-devel@vger.kernel.org - rds-devel@oss.oracle.com - linux-afs@lists.infradead.org - tipc-discussion@lists.sourceforge.net - " linux-x25@vger.kernel.org\0" + " David S. Miller <davem@davemloft.net>\0" "\00:1\0" "b\0" "I have to admit I didn't spot the difference between the good and the\n" @@ -353,4 +353,4 @@ "-- \n" 2.27.0 -939d978b1d81c1c17570789f4efbadd38bd44c88956098ef18e6f115dc664c25 +847aa749978c69718657b4b65b387832b07047fbd2d18aa679f95096f4d5c117
diff --git a/a/1.txt b/N2/1.txt index d371426..31214ff 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -288,8 +288,8 @@ index b97eb4b538fd4e..91bf6635ea9ee4 100644 if (!mem) return ERR_PTR(-ENOMEM); -- if (copy_from_sockptr(mem, arg, len) == 0) -+ if (copy_from_sockptr_offset(mem, arg, offset, len) == 0) +- if (copy_from_sockptr(mem, arg, len) = 0) ++ if (copy_from_sockptr_offset(mem, arg, offset, len) = 0) return mem; vfree(mem); diff --git a/a/content_digest b/N2/content_digest index fbc902c..16eb651 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,41 +1,8 @@ - "ref\020200723060908.50081-1-hch@lst.de\0" "ref\020200723060908.50081-20-hch@lst.de\0" - "ref\020200727121505.GA1804864@shredder\0" - "ref\020200727130029.GA26393@lst.de\0" - "ref\020200727133331.GA1851348@shredder\0" "From\0Christoph Hellwig <hch@lst.de>\0" "Subject\0Re: [PATCH 19/26] net/ipv6: switch ipv6_flowlabel_opt to sockptr_t\0" - "Date\0Mon, 27 Jul 2020 18:15:55 +0200\0" - "To\0Ido Schimmel <idosch@idosch.org>\0" - "Cc\0Christoph Hellwig <hch@lst.de>" - David S. Miller <davem@davemloft.net> - Jakub Kicinski <kuba@kernel.org> - Alexei Starovoitov <ast@kernel.org> - Daniel Borkmann <daniel@iogearbox.net> - Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> - Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> - Eric Dumazet <edumazet@google.com> - linux-crypto@vger.kernel.org - linux-kernel@vger.kernel.org - netdev@vger.kernel.org - bpf@vger.kernel.org - netfilter-devel@vger.kernel.org - coreteam@netfilter.org - linux-sctp@vger.kernel.org - linux-hams@vger.kernel.org - linux-bluetooth@vger.kernel.org - bridge@lists.linux-foundation.org - linux-can@vger.kernel.org - dccp@vger.kernel.org - linux-decnet-user@lists.sourceforge.net - linux-wpan@vger.kernel.org - linux-s390@vger.kernel.org - mptcp@lists.01.org - lvs-devel@vger.kernel.org - rds-devel@oss.oracle.com - linux-afs@lists.infradead.org - tipc-discussion@lists.sourceforge.net - " linux-x25@vger.kernel.org\0" + "Date\0Mon, 27 Jul 2020 16:15:55 +0000\0" + "To\0dccp@vger.kernel.org\0" "\00:1\0" "b\0" "I have to admit I didn't spot the difference between the good and the\n" @@ -328,8 +295,8 @@ " \tif (!mem)\n" " \t\treturn ERR_PTR(-ENOMEM);\n" " \n" - "-\tif (copy_from_sockptr(mem, arg, len) == 0)\n" - "+\tif (copy_from_sockptr_offset(mem, arg, offset, len) == 0)\n" + "-\tif (copy_from_sockptr(mem, arg, len) = 0)\n" + "+\tif (copy_from_sockptr_offset(mem, arg, offset, len) = 0)\n" " \t\treturn mem;\n" " \n" " \tvfree(mem);\n" @@ -353,4 +320,4 @@ "-- \n" 2.27.0 -939d978b1d81c1c17570789f4efbadd38bd44c88956098ef18e6f115dc664c25 +91d001e233406c794e8eb1676aae03b8415d939d4f7843a205ce2cfe44edc79f
diff --git a/a/content_digest b/N3/content_digest index fbc902c..ee02bee 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -31,11 +31,7 @@ linux-wpan@vger.kernel.org linux-s390@vger.kernel.org mptcp@lists.01.org - lvs-devel@vger.kernel.org - rds-devel@oss.oracle.com - linux-afs@lists.infradead.org - tipc-discussion@lists.sourceforge.net - " linux-x25@vger.kernel.org\0" + " lvs-devel@\0" "\00:1\0" "b\0" "I have to admit I didn't spot the difference between the good and the\n" @@ -353,4 +349,4 @@ "-- \n" 2.27.0 -939d978b1d81c1c17570789f4efbadd38bd44c88956098ef18e6f115dc664c25 +b5a35bb496d1ebfb96b005a0d4d65e70c875263637aab8dc667c78a05ee47b9e
diff --git a/a/content_digest b/N4/content_digest index fbc902c..9b16c6c 100644 --- a/a/content_digest +++ b/N4/content_digest @@ -31,11 +31,7 @@ linux-wpan@vger.kernel.org linux-s390@vger.kernel.org mptcp@lists.01.org - lvs-devel@vger.kernel.org - rds-devel@oss.oracle.com - linux-afs@lists.infradead.org - tipc-discussion@lists.sourceforge.net - " linux-x25@vger.kernel.org\0" + "\0" "\00:1\0" "b\0" "I have to admit I didn't spot the difference between the good and the\n" @@ -353,4 +349,4 @@ "-- \n" 2.27.0 -939d978b1d81c1c17570789f4efbadd38bd44c88956098ef18e6f115dc664c25 +ac2f012f4dbaed9c7d5d13e73e6bc3d8ad1501e6649f8d84710a2cbe9fe5c8df
diff --git a/a/1.txt b/N5/1.txt index d371426..31214ff 100644 --- a/a/1.txt +++ b/N5/1.txt @@ -288,8 +288,8 @@ index b97eb4b538fd4e..91bf6635ea9ee4 100644 if (!mem) return ERR_PTR(-ENOMEM); -- if (copy_from_sockptr(mem, arg, len) == 0) -+ if (copy_from_sockptr_offset(mem, arg, offset, len) == 0) +- if (copy_from_sockptr(mem, arg, len) = 0) ++ if (copy_from_sockptr_offset(mem, arg, offset, len) = 0) return mem; vfree(mem); diff --git a/a/content_digest b/N5/content_digest index fbc902c..8aac2e0 100644 --- a/a/content_digest +++ b/N5/content_digest @@ -5,7 +5,7 @@ "ref\020200727133331.GA1851348@shredder\0" "From\0Christoph Hellwig <hch@lst.de>\0" "Subject\0Re: [PATCH 19/26] net/ipv6: switch ipv6_flowlabel_opt to sockptr_t\0" - "Date\0Mon, 27 Jul 2020 18:15:55 +0200\0" + "Date\0Mon, 27 Jul 2020 16:15:55 +0000\0" "To\0Ido Schimmel <idosch@idosch.org>\0" "Cc\0Christoph Hellwig <hch@lst.de>" David S. Miller <davem@davemloft.net> @@ -328,8 +328,8 @@ " \tif (!mem)\n" " \t\treturn ERR_PTR(-ENOMEM);\n" " \n" - "-\tif (copy_from_sockptr(mem, arg, len) == 0)\n" - "+\tif (copy_from_sockptr_offset(mem, arg, offset, len) == 0)\n" + "-\tif (copy_from_sockptr(mem, arg, len) = 0)\n" + "+\tif (copy_from_sockptr_offset(mem, arg, offset, len) = 0)\n" " \t\treturn mem;\n" " \n" " \tvfree(mem);\n" @@ -353,4 +353,4 @@ "-- \n" 2.27.0 -939d978b1d81c1c17570789f4efbadd38bd44c88956098ef18e6f115dc664c25 +0e619a9d5da8cbb4f3f1b9c449c946432f984c168d469192973b773c1c7ddab8
diff --git a/a/1.txt b/N6/1.txt index d371426..b0ed4d9 100644 --- a/a/1.txt +++ b/N6/1.txt @@ -5,7 +5,7 @@ But can you try the patch below? --- From cce2d2e1b43ecee5f4af7cf116808b74b330080f Mon Sep 17 00:00:00 2001 -From: Christoph Hellwig <hch@lst.de> +From: Christoph Hellwig <hch(a)lst.de> Date: Mon, 27 Jul 2020 17:42:27 +0200 Subject: net: remove sockptr_advance @@ -13,9 +13,9 @@ sockptr_advance never properly worked. Replace it with _offset variants of copy_from_sockptr and copy_to_sockptr. Fixes: ba423fdaa589 ("net: add a new sockptr_t type") -Reported-by: Jason A. Donenfeld <Jason@zx2c4.com> -Reported-by: Ido Schimmel <idosch@idosch.org> -Signed-off-by: Christoph Hellwig <hch@lst.de> +Reported-by: Jason A. Donenfeld <Jason(a)zx2c4.com> +Reported-by: Ido Schimmel <idosch(a)idosch.org> +Signed-off-by: Christoph Hellwig <hch(a)lst.de> --- drivers/crypto/chelsio/chtls/chtls_main.c | 12 +++++----- include/linux/sockptr.h | 27 +++++++++++------------ diff --git a/a/content_digest b/N6/content_digest index fbc902c..484724c 100644 --- a/a/content_digest +++ b/N6/content_digest @@ -1,42 +1,8 @@ - "ref\020200723060908.50081-1-hch@lst.de\0" - "ref\020200723060908.50081-20-hch@lst.de\0" - "ref\020200727121505.GA1804864@shredder\0" - "ref\020200727130029.GA26393@lst.de\0" - "ref\020200727133331.GA1851348@shredder\0" - "From\0Christoph Hellwig <hch@lst.de>\0" - "Subject\0Re: [PATCH 19/26] net/ipv6: switch ipv6_flowlabel_opt to sockptr_t\0" + "From\0Christoph Hellwig <hch at lst.de>\0" + "Subject\0[MPTCP] Re: [PATCH 19/26] net/ipv6: switch ipv6_flowlabel_opt to sockptr_t\0" "Date\0Mon, 27 Jul 2020 18:15:55 +0200\0" - "To\0Ido Schimmel <idosch@idosch.org>\0" - "Cc\0Christoph Hellwig <hch@lst.de>" - David S. Miller <davem@davemloft.net> - Jakub Kicinski <kuba@kernel.org> - Alexei Starovoitov <ast@kernel.org> - Daniel Borkmann <daniel@iogearbox.net> - Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> - Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> - Eric Dumazet <edumazet@google.com> - linux-crypto@vger.kernel.org - linux-kernel@vger.kernel.org - netdev@vger.kernel.org - bpf@vger.kernel.org - netfilter-devel@vger.kernel.org - coreteam@netfilter.org - linux-sctp@vger.kernel.org - linux-hams@vger.kernel.org - linux-bluetooth@vger.kernel.org - bridge@lists.linux-foundation.org - linux-can@vger.kernel.org - dccp@vger.kernel.org - linux-decnet-user@lists.sourceforge.net - linux-wpan@vger.kernel.org - linux-s390@vger.kernel.org - mptcp@lists.01.org - lvs-devel@vger.kernel.org - rds-devel@oss.oracle.com - linux-afs@lists.infradead.org - tipc-discussion@lists.sourceforge.net - " linux-x25@vger.kernel.org\0" - "\00:1\0" + "To\0mptcp at lists.01.org\0" + "\01:1\0" "b\0" "I have to admit I didn't spot the difference between the good and the\n" "bad output even after trying hard..\n" @@ -45,7 +11,7 @@ "\n" "---\n" "From cce2d2e1b43ecee5f4af7cf116808b74b330080f Mon Sep 17 00:00:00 2001\n" - "From: Christoph Hellwig <hch@lst.de>\n" + "From: Christoph Hellwig <hch(a)lst.de>\n" "Date: Mon, 27 Jul 2020 17:42:27 +0200\n" "Subject: net: remove sockptr_advance\n" "\n" @@ -53,9 +19,9 @@ "of copy_from_sockptr and copy_to_sockptr.\n" "\n" "Fixes: ba423fdaa589 (\"net: add a new sockptr_t type\")\n" - "Reported-by: Jason A. Donenfeld <Jason@zx2c4.com>\n" - "Reported-by: Ido Schimmel <idosch@idosch.org>\n" - "Signed-off-by: Christoph Hellwig <hch@lst.de>\n" + "Reported-by: Jason A. Donenfeld <Jason(a)zx2c4.com>\n" + "Reported-by: Ido Schimmel <idosch(a)idosch.org>\n" + "Signed-off-by: Christoph Hellwig <hch(a)lst.de>\n" "---\n" " drivers/crypto/chelsio/chtls/chtls_main.c | 12 +++++-----\n" " include/linux/sockptr.h | 27 +++++++++++------------\n" @@ -353,4 +319,4 @@ "-- \n" 2.27.0 -939d978b1d81c1c17570789f4efbadd38bd44c88956098ef18e6f115dc664c25 +8aaad5f21c1fd1eb129ac358d9d553c333f8007f76ebe2a7534aad1cc5be4f38
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.