From: Geliang Tang <geliang@kernel.org>
To: Matthieu Baerts <matttbe@kernel.org>
Cc: mptcp@lists.linux.dev
Subject: Re: sync requests from bpf-next
Date: Mon, 15 Apr 2024 09:47:14 +0800 [thread overview]
Message-ID: <aa82c458d6fd621553029e637f3788da45cfa874.camel@kernel.org> (raw)
In-Reply-To: <baab617b-2829-4a6c-8979-d857ad0f91d7@kernel.org>
On Fri, 2024-04-12 at 10:04 +0200, Matthieu Baerts wrote:
> Hi Geliang,
>
> On 12/04/2024 03:21, Geliang Tang wrote:
> > Hi Matt,
> >
> > On Wed, 2024-04-10 at 17:26 +0200, Matthieu Baerts wrote:
> > > Hi Geliang,
> > >
> > > On 10/04/2024 12:21, Geliang Tang wrote:
> > > > These four patches need to be merged into mptcp_net-next from
> > > > bpf-
> > > > next
> > > > to avoid conflicts:
> > >
> > > For which series do you need these patches to be cherry-picked
> > > from
> > > bpf-next repo?
> > >
> > > I assume it is for "use start_server and connect_to helpers" and
> > > "export
> > > send_recv_data (v4)", right? These series don't directly modify
> > > MPTCP
> > > code or tests, do you need MPTCP CI to validate them?
> >
> > The series "export send_recv_data"
> >
> > selftests/bpf: Add struct send_recv_arg
> > selftests/bpf: Export send_recv_data helper
> >
> > accepted by bpf-next needs to merge into mptcp_net-next. I changes
> > them
> > as "Queued" on our patchwork. But patch 2 has modified by Martin a
> > little bit.
> >
> > Patch 2 will conflicts when merging it without the patches I
> > mentioned
> > in this 'sync requests'.
> >
> > Another option is to fix the conflicts, it's much simpler.
>
> Would it be OK to wait for these patches to be in net-next? BPF
> maintainers usually send their pull-requests on Monday.
>
> If there is no urgency, it would be easier and safer I think. Plus,
Sure, I can wait.
> there are two BPF series that are currently in review ("refactor
> mptcp
> bpf tests" and "setsockopt per subflow: BPF"), best not to have
> multiple
> reviews on the same topic in parallel, otherwise it is hard to
Sure.
Regards,
Geliang
> follow,
> especially for those not fully involved in them.
>
> Cheers,
> Matt
prev parent reply other threads:[~2024-04-15 1:47 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-10 10:21 sync requests from bpf-next Geliang Tang
2024-04-10 15:26 ` Matthieu Baerts
2024-04-10 15:28 ` Matthieu Baerts
2024-04-12 1:21 ` Geliang Tang
2024-04-12 8:04 ` Matthieu Baerts
2024-04-15 1:47 ` Geliang Tang [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=aa82c458d6fd621553029e637f3788da45cfa874.camel@kernel.org \
--to=geliang@kernel.org \
--cc=matttbe@kernel.org \
--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 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).