diff options
| author | David S. Miller <davem@davemloft.net> | 2022-06-27 11:47:18 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-06-27 11:47:18 +0100 |
| commit | 9dd094ee142b8dfd649df2d43c71a2ac7536b9ea (patch) | |
| tree | 8ad473d3bc0c6f93bc681b1abc8ea7654d69b474 /MAINTAINERS | |
| parent | c83bc86a0596f88958a4279e2558e65c7332169a (diff) | |
| parent | c3d396120d68c40cdf2a2da70eff3bf8806f0ff5 (diff) | |
| download | linux-9dd094ee142b8dfd649df2d43c71a2ac7536b9ea.tar.gz linux-9dd094ee142b8dfd649df2d43c71a2ac7536b9ea.tar.bz2 linux-9dd094ee142b8dfd649df2d43c71a2ac7536b9ea.zip | |
Merge tag 'linux-can-next-for-5.20-20220625' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2022-06-25
this is a pull request of 22 patches for net-next/master.
The first 2 patches target the xilinx driver. Srinivas Neeli's patch
adds Transmitter Delay Compensation (TDC) support, a patch by me fixes
a typo.
The next patch is by me and fixes a typo in the m_can driver.
Another patch by me allows the configuration of fixed bit rates
without need for do_set_bittiming callback.
The following 7 patches are by Vincent Mailhol and refactor the
can-dev module and Kbuild, de-inline the can_dropped_invalid_skb()
function, which has grown over the time, and drop outgoing skbs if the
controller is in listen only mode.
Max Staudt's patch fixes a reference in the networking/can.rst
documentation.
Vincent Mailhol provides 2 patches with cleanups for the etas_es58x
driver.
Conor Dooley adds bindings for the mpfs-can to the PolarFire SoC dtsi.
Another patch by me allows the configuration of fixed data bit rates
without need for do_set_data_bittiming callback.
The last 5 patches are by Frank Jungclaus. They prepare the esd_usb
driver to add support for the the CAN-USB/3 device in a later series.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4163c072842e..36f0a205c54a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7420,6 +7420,13 @@ S: Maintained F: include/linux/errseq.h F: lib/errseq.c +ESD CAN/USB DRIVERS +M: Frank Jungclaus <frank.jungclaus@esd.eu> +R: socketcan@esd.eu +L: linux-can@vger.kernel.org +S: Maintained +F: drivers/net/can/usb/esd_usb.c + ET131X NETWORK DRIVER M: Mark Einon <mark.einon@gmail.com> S: Odd Fixes |