Unverified Commit fd4d9056 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9352 MPTCP Upstream part 10 

Merge Pull Request from: @geliangtang 
 
mptcp: misc. fixes for v6.7

Patch 1 renames the MPTCP path management spec from mptcp.yaml to mptcp_pm.yaml.

Patch 2 adds a description for net/netlink/diag.c

Patch 3 adds a description for MPTCP Kunit test modules to avoid a
warning.

Patch 4 adds an entry to the mailmap file for Geliang's email addresses.

Patch 5 updates Geliang's email address in the MAINTAINERS file. 
 
Link:https://gitee.com/openeuler/kernel/pulls/9352

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 515f24d7 2797db36

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -188,6 +188,10 @@ Gao Xiang <xiang@kernel.org> <gaoxiang25@huawei.com> 
Gao Xiang <xiang@kernel.org> <hsiangkao@aol.com>

Gao Xiang <xiang@kernel.org> <hsiangkao@linux.alibaba.com>

Gao Xiang <xiang@kernel.org> <hsiangkao@redhat.com>

Geliang Tang <geliang.tang@linux.dev> <geliang.tang@suse.com>

Geliang Tang <geliang.tang@linux.dev> <geliangtang@xiaomi.com>

Geliang Tang <geliang.tang@linux.dev> <geliangtang@gmail.com>

Geliang Tang <geliang.tang@linux.dev> <geliangtang@163.com>

Georgi Djakov <djakov@kernel.org> <georgi.djakov@linaro.org>

Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>

Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -15002,6 +15002,7 @@ K: \bmdo_ 
NETWORKING [MPTCP]

M:	Matthieu Baerts <matttbe@kernel.org>

M:	Mat Martineau <martineau@kernel.org>

R:	Geliang Tang <geliang.tang@linux.dev>

L:	netdev@vger.kernel.org

L:	mptcp@lists.linux.dev

S:	Maintained
@@ -15009,7 +15010,7 @@ W: https://github.com/multipath-tcp/mptcp_net-next/wiki 
B:	https://github.com/multipath-tcp/mptcp_net-next/issues

T:	git https://github.com/multipath-tcp/mptcp_net-next.git export-net

T:	git https://github.com/multipath-tcp/mptcp_net-next.git export

F:	Documentation/netlink/specs/mptcp.yaml

F:	Documentation/netlink/specs/mptcp_pm.yaml

F:	Documentation/networking/mptcp-sysctl.rst

F:	include/net/mptcp.h

F:	include/trace/events/mptcp.h

include/uapi/linux/mptcp_pm.h

+1 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */

/* Do not edit directly, auto-generated from: */

/*	Documentation/netlink/specs/mptcp.yaml */

/*	Documentation/netlink/specs/mptcp_pm.yaml */

/* YNL-GEN uapi header */



#ifndef _UAPI_LINUX_MPTCP_PM_H

net/mptcp/crypto_test.c

+1 −0
Original line number Diff line number Diff line
@@ -70,3 +70,4 @@ static struct kunit_suite mptcp_crypto_suite = { 
kunit_test_suite(mptcp_crypto_suite);



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("KUnit tests for MPTCP Crypto");