diff options
author | Jakub Kicinski <kuba@kernel.org> | 2023-12-01 03:10:40 +0300 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2023-12-01 03:11:19 +0300 |
commit | 975f2d73a99f35b57ffa2ad7bff8562225cdcfcb (patch) | |
tree | d6c9ce96cfd889281e003a310c79d5a12a3cf924 /MAINTAINERS | |
parent | f9893fdac319bb2817e5e7818870264d7fb2eb02 (diff) | |
parent | 6172a5180fcc65170bfa2d49e55427567860f2a7 (diff) | |
download | linux-975f2d73a99f35b57ffa2ad7bff8562225cdcfcb.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index dcdc7e86ca9c..e3fd148d462e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -22056,6 +22056,7 @@ F: drivers/watchdog/tqmx86_wdt.c TRACING M: Steven Rostedt <rostedt@goodmis.org> M: Masami Hiramatsu <mhiramat@kernel.org> +R: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> L: linux-kernel@vger.kernel.org L: linux-trace-kernel@vger.kernel.org S: Maintained |