From: Jakub Kicinski <kuba@kernel.org>
Date: Tue, 9 Dec 2025 07:54:05 +0000 (-0800)
Subject: Merge branch 'mptcp-misc-fixes-for-v6-19-rc1'
X-Git-Tag: v6.19-rc2~30^2~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=186468c67fc687650b7fb713d8c627d5c8566886;p=thirdparty%2Flinux.git

Merge branch 'mptcp-misc-fixes-for-v6-19-rc1'

Matthieu Baerts says:

====================
mptcp: misc fixes for v6.19-rc1

Here are various unrelated fixes:

- Patches 1-2: ignore unknown in-kernel PM endpoint flags instead of
  pretending they are supported. A fix for v5.7.

- Patch 3: avoid potential unnecessary rtx timer expiration. A fix for
  v5.15.

- Patch 4: avoid a deadlock on fallback in case of SKB creation failure
  while re-injecting.
====================

Link: https://patch.msgid.link/20251205-net-mptcp-misc-fixes-6-19-rc1-v1-0-9e4781a6c1b8@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

186468c67fc687650b7fb713d8c627d5c8566886