From: Mat Martineau <martineau@kernel.org>
To: Jakub Kicinski <kuba@kernel.org>
Cc: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>,
mptcp@lists.linux.dev, Geliang Tang <geliang@kernel.org>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Paolo Abeni <pabeni@redhat.com>, Florian Westphal <fw@strlen.de>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Gregory Detal <gregory.detal@gmail.com>
Subject: Re: [PATCH net-next 0/8] mptcp: small improvements, fix and clean-ups
Date: Mon, 13 May 2024 17:33:14 -0700 (PDT) [thread overview]
Message-ID: <8829dfe5-d05a-4103-34af-90f0434ef390@kernel.org> (raw)
In-Reply-To: <20240513172941.290cc5cd@kernel.org>
On Mon, 13 May 2024, Jakub Kicinski wrote:
> On Mon, 13 May 2024 17:24:08 -0700 (PDT) Mat Martineau wrote:
>> The conflict here is purely in the diff context, patch 2 of this series
>> and "tcp: socket option to check for MPTCP fallback to TCP" add cases to
>> the same switch statement and have a couple of unmodified lines between
>> their additions.
>>
>> "git am -3" handles it cleanly in this case, if you have time and
>> inclination for a second attempt. But I realize you're working through a
>> backlog and net-next is now closed, so that time might not be available.
>> We'll try again when net-next reopens if needed.
>
> Your -3 must be more powerful somehow, or my scripts are broken because
> it isn't enough on my end.
>
> If you can do a quick resend there's still a chance. The patches look
> quite simple.
Thanks Jakub! Spinning a quick v2 right now.
- Mat
next prev parent reply other threads:[~2024-05-14 0:33 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-10 11:18 [PATCH net-next 0/8] mptcp: small improvements, fix and clean-ups Matthieu Baerts (NGI0)
2024-05-10 11:18 ` [PATCH net-next 1/8] mptcp: SO_KEEPALIVE: fix getsockopt support Matthieu Baerts (NGI0)
2024-05-10 11:18 ` [PATCH net-next 2/8] mptcp: fix full TCP keep-alive support Matthieu Baerts (NGI0)
2024-05-10 11:18 ` [PATCH net-next 3/8] mptcp: sockopt: info: stop early if no buffer Matthieu Baerts (NGI0)
2024-05-10 11:18 ` [PATCH net-next 4/8] mptcp: add net.mptcp.available_schedulers Matthieu Baerts (NGI0)
2024-05-10 11:18 ` [PATCH net-next 5/8] mptcp: prefer strscpy over strcpy Matthieu Baerts (NGI0)
2024-05-10 11:18 ` [PATCH net-next 6/8] mptcp: remove unnecessary else statements Matthieu Baerts (NGI0)
2024-05-10 11:18 ` [PATCH net-next 7/8] mptcp: move mptcp_pm_gen.h's include Matthieu Baerts (NGI0)
2024-05-10 11:18 ` [PATCH net-next 8/8] mptcp: include inet_common in mib.h Matthieu Baerts (NGI0)
2024-05-13 23:06 ` [PATCH net-next 0/8] mptcp: small improvements, fix and clean-ups Jakub Kicinski
2024-05-14 0:24 ` Mat Martineau
2024-05-14 0:29 ` Jakub Kicinski
2024-05-14 0:33 ` Mat Martineau [this message]
2024-05-14 8:06 ` Matthieu Baerts
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=8829dfe5-d05a-4103-34af-90f0434ef390@kernel.org \
--to=martineau@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=fw@strlen.de \
--cc=geliang@kernel.org \
--cc=gregory.detal@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matttbe@kernel.org \
--cc=mptcp@lists.linux.dev \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/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