From: Jakub Kicinski Date: Tue, 14 May 2024 01:29:25 +0000 (-0700) Subject: Merge branch 'mptcp-small-improvements-fix-and-clean-ups' X-Git-Tag: io_uring-6.10-20240523~85^2~6 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=95125152dcc57a4f4810134e0d4f975462f95b8e;p=linux-2.6-block.git Merge branch 'mptcp-small-improvements-fix-and-clean-ups' Mat Martineau says: ==================== mptcp: small improvements, fix and clean-ups 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. ==================== Link: https://lore.kernel.org/r/20240514011335.176158-1-martineau@kernel.org Signed-off-by: Jakub Kicinski --- 95125152dcc57a4f4810134e0d4f975462f95b8e