From: Matthieu Baerts <matttbe@kernel.org>
To: mptcp@lists.linux.dev, Mat Martineau <martineau@kernel.org>,
Geliang Tang <geliang@kernel.org>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Shuah Khan <shuah@kernel.org>
Cc: netdev@vger.kernel.org, linux-kselftest@vger.kernel.org,
linux-kernel@vger.kernel.org,
Geliang Tang <tanggeliang@kylinos.cn>
Subject: Re: [PATCH net-next 03/13] selftests: mptcp: add mptcp_lib_check_output helper
Date: Tue, 5 Mar 2024 12:19:02 +0100 [thread overview]
Message-ID: <8b2b6492-d460-4981-8624-068dd766d3ac@kernel.org> (raw)
In-Reply-To: <20240305-upstream-net-next-20240304-selftests-mptcp-shared-code-shellcheck-v1-3-66618ea5504e@kernel.org>
Hello,
On 05/03/2024 11:42, Matthieu Baerts (NGI0) wrote:
> From: Geliang Tang <tanggeliang@kylinos.cn>
>
> Extract the main part of check() in pm_netlink.sh into a new helper
> named mptcp_lib_check_output in mptcp_lib.sh.
>
> This helper will be used for userspace dump addresses tests.
Arf, I just noticed that when the MPTCP tree got rebased on top of
net-next, Git didn't drop this patch, but resolved the conflicts by
duplicating mptcp_lib_check_output() function. Of course, redefining the
function is OK in Bash, and I didn't notice the issue when running the
tests...
I will resend this series without this patch tomorrow.
Sorry for the noise :-/
pw-bot: changes-requested
Cheers,
Matt
--
Sponsored by the NGI0 Core fund.
next prev parent reply other threads:[~2024-03-05 11:19 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-05 10:42 [PATCH net-next 00/13] selftests: mptcp: share code and fix shellcheck warnings Matthieu Baerts (NGI0)
2024-03-05 10:42 ` [PATCH net-next 01/13] selftests: mptcp: stop forcing iptables-legacy Matthieu Baerts (NGI0)
2024-03-05 10:42 ` [PATCH net-next 02/13] selftests: mptcp: add mptcp_lib_check_tools helper Matthieu Baerts (NGI0)
2024-03-05 10:42 ` [PATCH net-next 03/13] selftests: mptcp: add mptcp_lib_check_output helper Matthieu Baerts (NGI0)
2024-03-05 11:19 ` Matthieu Baerts [this message]
2024-03-05 10:42 ` [PATCH net-next 04/13] selftests: mptcp: add local variables rndh Matthieu Baerts (NGI0)
2024-03-05 10:42 ` [PATCH net-next 05/13] selftests: mptcp: add mptcp_lib_ns_init/exit helpers Matthieu Baerts (NGI0)
2024-03-05 10:42 ` [PATCH net-next 06/13] selftests: mptcp: more operations in ns_init/exit Matthieu Baerts (NGI0)
2024-03-05 10:42 ` [PATCH net-next 07/13] selftests: mptcp: add mptcp_lib_events helper Matthieu Baerts (NGI0)
2024-03-05 10:42 ` [PATCH net-next 08/13] selftests: mptcp: diag: fix shellcheck warnings Matthieu Baerts (NGI0)
2024-03-05 10:42 ` [PATCH net-next 09/13] selftests: mptcp: connect: " Matthieu Baerts (NGI0)
2024-03-05 10:42 ` [PATCH net-next 10/13] selftests: mptcp: sockopt: " Matthieu Baerts (NGI0)
2024-03-05 10:42 ` [PATCH net-next 11/13] selftests: mptcp: pm netlink: " Matthieu Baerts (NGI0)
2024-03-05 10:42 ` [PATCH net-next 12/13] selftests: mptcp: simult flows: " Matthieu Baerts (NGI0)
2024-03-05 10:42 ` [PATCH net-next 13/13] selftests: userspace pm: avoid relaunching pm events Matthieu Baerts (NGI0)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8b2b6492-d460-4981-8624-068dd766d3ac@kernel.org \
--to=matttbe@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=geliang@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=martineau@kernel.org \
--cc=mptcp@lists.linux.dev \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=shuah@kernel.org \
--cc=tanggeliang@kylinos.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).