diff for duplicates of <20190109105007.GA14518@kadam> diff --git a/a/1.txt b/N1/1.txt index 2431270..42a1b2f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,7 +1,7 @@ -This should be = instead of =. +This should be == instead of =. Fixes: b52354aa068e ("selftests: expand txtimestamp with ipv6 dgram + raw and pf_packet") -Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> +Signed-off-by: Dan Carpenter <dan.carpenter at oracle.com> --- tools/testing/selftests/networking/timestamping/txtimestamp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -11,12 +11,12 @@ index 2e563d17cf0c..d1bbafb16f47 100644 --- a/tools/testing/selftests/networking/timestamping/txtimestamp.c +++ b/tools/testing/selftests/networking/timestamping/txtimestamp.c @@ -240,7 +240,7 @@ static void __recv_errmsg_cmsg(struct msghdr *msg, int payload_len) - cm->cmsg_type = IP_RECVERR) || - (cm->cmsg_level = SOL_IPV6 && - cm->cmsg_type = IPV6_RECVERR) || + cm->cmsg_type == IP_RECVERR) || + (cm->cmsg_level == SOL_IPV6 && + cm->cmsg_type == IPV6_RECVERR) || - (cm->cmsg_level = SOL_PACKET && -+ (cm->cmsg_level = SOL_PACKET && - cm->cmsg_type = PACKET_TX_TIMESTAMP)) { ++ (cm->cmsg_level == SOL_PACKET && + cm->cmsg_type == PACKET_TX_TIMESTAMP)) { serr = (void *) CMSG_DATA(cm); if (serr->ee_errno != ENOMSG || -- diff --git a/a/content_digest b/N1/content_digest index 198190b..42ed2cb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,12 @@ - "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" + "From\0dan.carpenter at oracle.com (Dan Carpenter)\0" "Subject\0[PATCH net] selftests/txtimestamp: Fix an equals vs assign bug\0" - "Date\0Wed, 09 Jan 2019 10:50:07 +0000\0" - "To\0kernel-janitors@vger.kernel.org\0" + "Date\0Wed, 9 Jan 2019 13:50:07 +0300\0" "\00:1\0" "b\0" - "This should be = instead of =.\n" + "This should be == instead of =.\n" "\n" "Fixes: b52354aa068e (\"selftests: expand txtimestamp with ipv6 dgram + raw and pf_packet\")\n" - "Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>\n" + "Signed-off-by: Dan Carpenter <dan.carpenter at oracle.com>\n" "---\n" " tools/testing/selftests/networking/timestamping/txtimestamp.c | 2 +-\n" " 1 file changed, 1 insertion(+), 1 deletion(-)\n" @@ -17,15 +16,15 @@ "--- a/tools/testing/selftests/networking/timestamping/txtimestamp.c\n" "+++ b/tools/testing/selftests/networking/timestamping/txtimestamp.c\n" "@@ -240,7 +240,7 @@ static void __recv_errmsg_cmsg(struct msghdr *msg, int payload_len)\n" - " \t\t\t cm->cmsg_type = IP_RECVERR) ||\n" - " \t\t\t (cm->cmsg_level = SOL_IPV6 &&\n" - " \t\t\t cm->cmsg_type = IPV6_RECVERR) ||\n" + " \t\t\t cm->cmsg_type == IP_RECVERR) ||\n" + " \t\t\t (cm->cmsg_level == SOL_IPV6 &&\n" + " \t\t\t cm->cmsg_type == IPV6_RECVERR) ||\n" "-\t\t\t (cm->cmsg_level = SOL_PACKET &&\n" - "+\t\t\t (cm->cmsg_level = SOL_PACKET &&\n" - " \t\t\t cm->cmsg_type = PACKET_TX_TIMESTAMP)) {\n" + "+\t\t\t (cm->cmsg_level == SOL_PACKET &&\n" + " \t\t\t cm->cmsg_type == PACKET_TX_TIMESTAMP)) {\n" " \t\t\tserr = (void *) CMSG_DATA(cm);\n" " \t\t\tif (serr->ee_errno != ENOMSG ||\n" "-- \n" 2.17.1 -67212b6341b504c299649aa3fad9024ac59e8c6d28b0fbbf1ebfcd5285d75ddd +2da7ad6f7cf5ccd131448e067a0229350d56b33ac659997f98eeb88b80357225
diff --git a/a/1.txt b/N2/1.txt index 2431270..42a1b2f 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,7 +1,7 @@ -This should be = instead of =. +This should be == instead of =. Fixes: b52354aa068e ("selftests: expand txtimestamp with ipv6 dgram + raw and pf_packet") -Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> +Signed-off-by: Dan Carpenter <dan.carpenter at oracle.com> --- tools/testing/selftests/networking/timestamping/txtimestamp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -11,12 +11,12 @@ index 2e563d17cf0c..d1bbafb16f47 100644 --- a/tools/testing/selftests/networking/timestamping/txtimestamp.c +++ b/tools/testing/selftests/networking/timestamping/txtimestamp.c @@ -240,7 +240,7 @@ static void __recv_errmsg_cmsg(struct msghdr *msg, int payload_len) - cm->cmsg_type = IP_RECVERR) || - (cm->cmsg_level = SOL_IPV6 && - cm->cmsg_type = IPV6_RECVERR) || + cm->cmsg_type == IP_RECVERR) || + (cm->cmsg_level == SOL_IPV6 && + cm->cmsg_type == IPV6_RECVERR) || - (cm->cmsg_level = SOL_PACKET && -+ (cm->cmsg_level = SOL_PACKET && - cm->cmsg_type = PACKET_TX_TIMESTAMP)) { ++ (cm->cmsg_level == SOL_PACKET && + cm->cmsg_type == PACKET_TX_TIMESTAMP)) { serr = (void *) CMSG_DATA(cm); if (serr->ee_errno != ENOMSG || -- diff --git a/a/content_digest b/N2/content_digest index 198190b..a947aa2 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,13 +1,12 @@ - "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" + "From\0dan.carpenter@oracle.com (Dan Carpenter)\0" "Subject\0[PATCH net] selftests/txtimestamp: Fix an equals vs assign bug\0" - "Date\0Wed, 09 Jan 2019 10:50:07 +0000\0" - "To\0kernel-janitors@vger.kernel.org\0" + "Date\0Wed, 9 Jan 2019 13:50:07 +0300\0" "\00:1\0" "b\0" - "This should be = instead of =.\n" + "This should be == instead of =.\n" "\n" "Fixes: b52354aa068e (\"selftests: expand txtimestamp with ipv6 dgram + raw and pf_packet\")\n" - "Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>\n" + "Signed-off-by: Dan Carpenter <dan.carpenter at oracle.com>\n" "---\n" " tools/testing/selftests/networking/timestamping/txtimestamp.c | 2 +-\n" " 1 file changed, 1 insertion(+), 1 deletion(-)\n" @@ -17,15 +16,15 @@ "--- a/tools/testing/selftests/networking/timestamping/txtimestamp.c\n" "+++ b/tools/testing/selftests/networking/timestamping/txtimestamp.c\n" "@@ -240,7 +240,7 @@ static void __recv_errmsg_cmsg(struct msghdr *msg, int payload_len)\n" - " \t\t\t cm->cmsg_type = IP_RECVERR) ||\n" - " \t\t\t (cm->cmsg_level = SOL_IPV6 &&\n" - " \t\t\t cm->cmsg_type = IPV6_RECVERR) ||\n" + " \t\t\t cm->cmsg_type == IP_RECVERR) ||\n" + " \t\t\t (cm->cmsg_level == SOL_IPV6 &&\n" + " \t\t\t cm->cmsg_type == IPV6_RECVERR) ||\n" "-\t\t\t (cm->cmsg_level = SOL_PACKET &&\n" - "+\t\t\t (cm->cmsg_level = SOL_PACKET &&\n" - " \t\t\t cm->cmsg_type = PACKET_TX_TIMESTAMP)) {\n" + "+\t\t\t (cm->cmsg_level == SOL_PACKET &&\n" + " \t\t\t cm->cmsg_type == PACKET_TX_TIMESTAMP)) {\n" " \t\t\tserr = (void *) CMSG_DATA(cm);\n" " \t\t\tif (serr->ee_errno != ENOMSG ||\n" "-- \n" 2.17.1 -67212b6341b504c299649aa3fad9024ac59e8c6d28b0fbbf1ebfcd5285d75ddd +b07ab2dbbaa20f605999fb5ba6cf85aac0b2a67e45ffdd5d30fafbadd36afc10
diff --git a/a/1.txt b/N3/1.txt index 2431270..ff2b91c 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -1,4 +1,4 @@ -This should be = instead of =. +This should be == instead of =. Fixes: b52354aa068e ("selftests: expand txtimestamp with ipv6 dgram + raw and pf_packet") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> @@ -11,12 +11,12 @@ index 2e563d17cf0c..d1bbafb16f47 100644 --- a/tools/testing/selftests/networking/timestamping/txtimestamp.c +++ b/tools/testing/selftests/networking/timestamping/txtimestamp.c @@ -240,7 +240,7 @@ static void __recv_errmsg_cmsg(struct msghdr *msg, int payload_len) - cm->cmsg_type = IP_RECVERR) || - (cm->cmsg_level = SOL_IPV6 && - cm->cmsg_type = IPV6_RECVERR) || + cm->cmsg_type == IP_RECVERR) || + (cm->cmsg_level == SOL_IPV6 && + cm->cmsg_type == IPV6_RECVERR) || - (cm->cmsg_level = SOL_PACKET && -+ (cm->cmsg_level = SOL_PACKET && - cm->cmsg_type = PACKET_TX_TIMESTAMP)) { ++ (cm->cmsg_level == SOL_PACKET && + cm->cmsg_type == PACKET_TX_TIMESTAMP)) { serr = (void *) CMSG_DATA(cm); if (serr->ee_errno != ENOMSG || -- diff --git a/a/content_digest b/N3/content_digest index 198190b..9d95165 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,10 +1,17 @@ "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[PATCH net] selftests/txtimestamp: Fix an equals vs assign bug\0" - "Date\0Wed, 09 Jan 2019 10:50:07 +0000\0" - "To\0kernel-janitors@vger.kernel.org\0" + "Date\0Wed, 9 Jan 2019 13:50:07 +0300\0" + "To\0Willem de Bruijn <willemb@google.com>\0" + "Cc\0Shuah Khan <shuah@kernel.org>" + David S. Miller <davem@davemloft.net> + Soheil Hassas Yeganeh <soheil@google.com> + Vinicius Costa Gomes <vinicius.gomes@intel.com> + linux-kselftest@vger.kernel.org + netdev@vger.kernel.org + " kernel-janitors@vger.kernel.org\0" "\00:1\0" "b\0" - "This should be = instead of =.\n" + "This should be == instead of =.\n" "\n" "Fixes: b52354aa068e (\"selftests: expand txtimestamp with ipv6 dgram + raw and pf_packet\")\n" "Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>\n" @@ -17,15 +24,15 @@ "--- a/tools/testing/selftests/networking/timestamping/txtimestamp.c\n" "+++ b/tools/testing/selftests/networking/timestamping/txtimestamp.c\n" "@@ -240,7 +240,7 @@ static void __recv_errmsg_cmsg(struct msghdr *msg, int payload_len)\n" - " \t\t\t cm->cmsg_type = IP_RECVERR) ||\n" - " \t\t\t (cm->cmsg_level = SOL_IPV6 &&\n" - " \t\t\t cm->cmsg_type = IPV6_RECVERR) ||\n" + " \t\t\t cm->cmsg_type == IP_RECVERR) ||\n" + " \t\t\t (cm->cmsg_level == SOL_IPV6 &&\n" + " \t\t\t cm->cmsg_type == IPV6_RECVERR) ||\n" "-\t\t\t (cm->cmsg_level = SOL_PACKET &&\n" - "+\t\t\t (cm->cmsg_level = SOL_PACKET &&\n" - " \t\t\t cm->cmsg_type = PACKET_TX_TIMESTAMP)) {\n" + "+\t\t\t (cm->cmsg_level == SOL_PACKET &&\n" + " \t\t\t cm->cmsg_type == PACKET_TX_TIMESTAMP)) {\n" " \t\t\tserr = (void *) CMSG_DATA(cm);\n" " \t\t\tif (serr->ee_errno != ENOMSG ||\n" "-- \n" 2.17.1 -67212b6341b504c299649aa3fad9024ac59e8c6d28b0fbbf1ebfcd5285d75ddd +52a3ae09b5f2051fced9ebfc1cb5a7f6726ec84eb1c6ee7229ce990fed4b1193
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.