tgupdate: merge remotes/origin/t/DO-NOT-MERGE-mptcp-enabled-by-default onto t/DO-NOT-MERGE-mptcp-enabled-by-default base

matttbe · matttbe · commit ebddc5ab02e3 · 2025-02-21T16:46:56.000+01:00
diff --git a/.topdeps b/.topdeps
@@ -0,0 +1 @@
+t/DO-NOT-MERGE-mptcp-use-kmalloc-on-kasan-build
diff --git a/.topmsg b/.topmsg
@@ -0,0 +1,6 @@
+From: Matthieu Baerts <matttbe@kernel.org>
+Subject: [PATCH] DO-NOT-MERGE: mptcp: enabled by default
+
+This commit is useful for automated builds, e.g. from Intel's kbuild.
+
+Signed-off-by: Matthieu Baerts <matttbe@kernel.org>
diff --git a/net/mptcp/Kconfig b/net/mptcp/Kconfig
@@ -5,6 +5,7 @@ config MPTCP
 	select SKB_EXTENSIONS
 	select CRYPTO_LIB_SHA256
 	select CRYPTO
+	default y
 	help
 	  Multipath TCP (MPTCP) connections send and receive data over multiple
 	  subflows in order to utilize multiple network paths. Each subflow

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+t/DO-NOT-MERGE-mptcp-use-kmalloc-on-kasan-build`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +From: Matthieu Baerts <[email protected]>
 +Subject: [PATCH] DO-NOT-MERGE: mptcp: enabled by default
++
 +This commit is useful for automated builds, e.g. from Intel's kbuild.
++
 +Signed-off-by: Matthieu Baerts <[email protected]>