* The commit "mptcp: add csum_reqd in mptcp_out_options" is changed @ 2021-06-19 13:29 Geliang Tang 2021-06-20 6:51 ` Matthieu Baerts 0 siblings, 1 reply; 2+ messages in thread From: Geliang Tang @ 2021-06-19 13:29 UTC (permalink / raw) To: Matthieu Baerts; +Cc: mptcp Hi Matt, 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. Please check it. Thanks. -Geliang ^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: The commit "mptcp: add csum_reqd in mptcp_out_options" is changed 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 0 siblings, 0 replies; 2+ messages in thread From: Matthieu Baerts @ 2021-06-20 6:51 UTC (permalink / raw) To: Geliang Tang; +Cc: mptcp 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 ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-20 6:51 UTC | newest] Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 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 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 NNTP newsgroup(s).