From: Matthieu Baerts <matthieu.baerts@tessares.net>
To: Geliang Tang <geliangtang@gmail.com>
Cc: mptcp@lists.linux.dev
Subject: Re: The commit "mptcp: add csum_reqd in mptcp_out_options" is changed
Date: Sun, 20 Jun 2021 08:51:02 +0200 [thread overview]
Message-ID: <c8332fd6-176a-b9cb-bbba-3db6d90d7f1f@tessares.net> (raw)
In-Reply-To: <CA+WQbwsyZe=yzLsC6tAonfoOx382ktTOugui30vB4wnTmgh08A@mail.gmail.com>
Hi Geliang,
On 19/06/2021 15:29, Geliang Tang wrote:
> I found that in today's export tree, export/20210619T070741, these two
> commits, c05843b6d4d0ac6b66d5e9f151b3140a015ba2d8 (mptcp: add csum_reqd in
> mptcp_out_options) and 64f0cb0f3851436973c145a05e9ada89baeb562f (mptcp: add
> allow_join_id0 in mptcp_out_options) should be merged into one commit.
Good catch! Thank you for checking that!
It looks like the auto-resolution of these conflicts didn't go as
expected and I didn't see the issue when looking at "mptcp: add
allow_join_id0 in mptcp_out_options". Fixed now!
- 6a02cef3835d: tg: empty t/mptcp-add-csum_reqd-in-mptcp_out_options
- 2c9eddf98b75: conflict in t/mptcp-add-allow_join_id0-in-mptcp_out_options
- Results: eb9ae196ed3a..4affd9122ce7
Builds and tests are now in progress:
https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20210620T065037
https://github.com/multipath-tcp/mptcp_net-next/actions/workflows/build-validation.yml?query=branch:export/20210620T065037
Cheers,
Matt
--
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
prev parent reply other threads:[~2021-06-20 6:51 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-19 13:29 The commit "mptcp: add csum_reqd in mptcp_out_options" is changed Geliang Tang
2021-06-20 6:51 ` Matthieu Baerts [this message]
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=c8332fd6-176a-b9cb-bbba-3db6d90d7f1f@tessares.net \
--to=matthieu.baerts@tessares.net \
--cc=geliangtang@gmail.com \
--cc=mptcp@lists.linux.dev \
/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 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.