diff options
| author | David S. Miller <davem@davemloft.net> | 2021-04-17 03:10:40 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-04-17 03:10:40 +0300 |
| commit | 474f459360399c5becfd0f189a8894e9e17ad3d3 (patch) | |
| tree | 4ac2215add7c9db2a6b0ffcb02f1d63481c82b7b /MAINTAINERS | |
| parent | 820dd7a244fe2d990d414172110f36cf5e8a936a (diff) | |
| parent | 442279154c73bc681e5346bdd1270a628dfdfdc7 (diff) | |
| download | linux-474f459360399c5becfd0f189a8894e9e17ad3d3.tar.xz | |
Merge branch 'mptcp-fixes-and-tracepoints'
Mat Martineau says:
====================
mptcp: Fixes and tracepoints from the mptcp tree
Here's one more batch of changes that we've tested out in the MPTCP tree.
Patch 1 makes the MPTCP KUnit config symbol more consistent with other
subsystems.
Patch 2 fixes a couple of format specifiers in pr_debug()s
Patches 3-7 add four helpful tracepoints for MPTCP.
Patch 8 is a one-line refactor to use an available helper macro.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 795b9941c151..0f82854cc430 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12546,6 +12546,7 @@ W: https://github.com/multipath-tcp/mptcp_net-next/wiki B: https://github.com/multipath-tcp/mptcp_net-next/issues F: Documentation/networking/mptcp-sysctl.rst F: include/net/mptcp.h +F: include/trace/events/mptcp.h F: include/uapi/linux/mptcp.h F: net/mptcp/ F: tools/testing/selftests/net/mptcp/ |