Received-SPF: pass (google.com: domain of linux-kernel+bounces-178207-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Mon, 13 May 2024 17:24:08 -0700 (PDT)
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
In-Reply-To: <20240513160630.545c3024@kernel.org>
Message-ID: <f60cac35-5a2b-16cf-4706-b2e41acfacae@kernel.org>
References: <20240510-upstream-net-next-20240509-misc-improvements-v1-0-4f25579e62ba@kernel.org> <20240513160630.545c3024@kernel.org>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; format=flowed; charset=US-ASCII

On Mon, 13 May 2024, Jakub Kicinski wrote:

> On Fri, 10 May 2024 13:18:30 +0200 Matthieu Baerts (NGI0) wrote:
>> This series contain mostly unrelated patches:
>>
>> - The two first patches can be seen as "fixes". They are part of this
>>   series for -next because it looks like the last batch of fixes for
>>   v6.9 has already been sent. These fixes are not urgent, so they can
>>   wait if an unlikely v6.9-rc8 is published. About the two patches:
>>     - Patch 1 fixes getsockopt(SO_KEEPALIVE) support on MPTCP sockets
>>     - Patch 2 makes sure the full TCP keep-alive feature is supported,
>>       not just SO_KEEPALIVE.
>>
>> - Patch 3 is a small optimisation when getsockopt(MPTCP_INFO) is used
>>   without buffer, just to check if MPTCP is still being used: no
>>   fallback to TCP.
>>
>> - Patch 4 adds net.mptcp.available_schedulers sysctl knob to list packet
>>   schedulers, similar to net.ipv4.tcp_available_congestion_control.
>>
>> - Patch 5 and 6 fix CheckPatch warnings: "prefer strscpy over strcpy"
>>   and "else is not generally useful after a break or return".
>>
>> - Patch 7 and 8 remove and add header includes to avoid unused ones, and
>>   add missing ones to be self-contained.
>
> Seems to conflict with:
> https://lore.kernel.org/all/20240509-upstream-net-next-20240509-mptcp-tcp_is_mptcp-v1-1-f846df999202@kernel.org/

Hi Jakub -

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.


Thanks,
Mat