nvelope-from domain
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager
 -0.0 DKIMWL_WL_HIGH         DKIMwl.org - High trust sender
SpamTally: Final spam score: -11

Greg recently reported the following patch could not be applied without
conflicts in this tree:

 - 4b1ff850e0c1 ("mptcp: pm: in-kernel: usable client side with C-flag")

Note that the following patch got applied, but at the wrong place and
requiring additional modifications:

 - 008385efd05e ("selftests: mptcp: join: validate C-flag + def limit")

Conflicts have been resolved, and documented in each patch.

Matthieu Baerts (NGI0) (2):
  mptcp: pm: in-kernel: usable client side with C-flag
  selftests: mptcp: join: validate C-flag + def limit

 net/mptcp/pm.c                                |  7 ++-
 net/mptcp/pm_netlink.c                        | 49 ++++++++++++++++++-
 net/mptcp/protocol.h                          |  8 +++
 .../testing/selftests/net/mptcp/mptcp_join.sh | 10 ++++
 4 files changed, 71 insertions(+), 3 deletions(-)

-- 
2.51.0



From - Fri Oct 17 14:42:25 2025
X-Mozilla-Status: 0001
X-Mozilla-Status2: 00000000
Return-Path: <stable+bounces-186341-hi=josie.lol@vger.kernel.org>
Delivered-To: hi@josie.lol
Received: from witcher.mxrouting.net
	by witcher.mxrouting.net with LMTP
	id EOPaDs5V8mhrtiUAYBR5ng
	(envelope-from <stable+bounces-186341-hi=josie.lol@vger.kernel.org>)
	for <hi@josie.lol>; Fri, 17 Oct 2025 14:42:22 +0000
Return-path: <stable+bounces-186341-hi=josie.lol@vger.kernel.org>
Envelope-to: hi@josie.lol
Delivery-date: Fri, 17 Oct 2025 14:42:22 +0000
Received: from am.mirrors.kernel.org ([147.75.80.249])
	by witcher.mxrouting.net with esmtps  (TLS1.3) tls TLS_AES_256_GCM_SHA384
	(Exim 4.98)
	(envelope-from <stable+bounces-186341-hi=josie.lol@vger.kernel.org>)
	id 1v9leu-0000000APpq-3vec
	for hi@josie.lol;
	Fri, 17 Oct 2025 14:42:22 +0000
Received: from smtp.subspace.kernel.org (relay.kernel.org [52.25.139.140])
	(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by am.mirrors.kernel.org (Postfix) with ESMTPS id 6696F189BD0E
	for <hi@josie.lol>; Fri, 17 Oct 2025 14:42:39 +0000 (UTC)
Received: from localhost.localdomain (localhost.localdomain [127.0.0.1])
	by smtp.subspace.kernel.org (Postfix) with ESMTP id C32CD32E138;
	Fri, 17 Oct 2025 14:42:12 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ne5/1SNV"
X-Original-To: stable@vger.kernel.org
Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 983B02E091E;
	Fri, 17 Oct 2025 14:42:12 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1760712132; cv=none; b=rdvOEyvfk1I+TY2GAcj/T+IvMUoZe7k5J0C80iUKuaw6l9RdBYMDceA+dLfA4q0Ramysec7uugBcRpZn6Ji8Do3uNV6RVBySccmRZTo3tQi+XKoyraBeBYc7C4JODIrYn4knNKmW/vdy4XNSjYQfPpGKadrtzrk4HbMCvwc49Bw=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1760712132; c=relaxed/simple;
	bh=PT+Q+rTJZe7i71rG0HVDaIMaB59mBx87VhMGd8QEjPw=;
	h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:
	 MIME-Version; b=Txc4LIxxJpBGrSFz1Qhn+Cia8VKjhE+Rrqb3e/AL/ObiE0QLv+DFVJl3s7ndFFkF1tRQSCTXsUL0KddoR89zvxQiyS/DDnq57mOXzuLwdQj2Ihu388XQ1MmjM6RFfyRZJRehMuFhW3DrskoYR7KeFHVmRacLgDrdnHepFOL2pVc=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ne5/1SNV; arc=none smtp.client-ip=10.30.226.201
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17A28C4CEE7;
	Fri, 17 Oct 2025 14:42:10 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
	s=k20201202