diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2020-10-10 02:58:46 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-10-10 02:58:46 +0200 |
| commit | 8f5e71b9d3b510b18cc969bc8f43a2470e19568b (patch) | |
| tree | ccd8a0647370bacf4a3a62e65106622118877316 /MAINTAINERS | |
| parent | Merge branch '100GbE-Intel-Wired-LAN-Driver-Updates-2020-10-07' (diff) | |
| parent | can: xilinx_can: Fix incorrect variable and initialize with a default value (diff) | |
| download | linux-8f5e71b9d3b510b18cc969bc8f43a2470e19568b.tar.xz linux-8f5e71b9d3b510b18cc969bc8f43a2470e19568b.zip | |
Merge tag 'linux-can-next-for-5.10-20201007' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says:
====================
linux-can-next-for-5.10-20201007
The first 3 patches are by me and fix several warnings found
when compiling the kernel with W=1.
Lukas Bulwahn's patch adjusts the MAINTAINERS file, to accommodate
the renaming of the mcp251xfd driver.
Vincent Mailhol contributes 3 patches for the CAN networking layer.
First error queue support is added the the CAN RAW protocol.
The second patch converts the get_can_dlc() and get_canfd_dlc()
in-Kernel-only macros from using __u8 to u8.
The third patch adds a helper function to calculate the length of
one bit in in multiple of time quanta.
Oliver Hartkopp's patch add support for the ISO 15765-2:2016
transport protocol to the CAN stack.
Three patches by Lad Prabhakar add documentation for various
new rcar controllers to the device tree bindings of the rcar_can
and rcan_canfd driver.
Michael Walle's patch adds various processors to the flexcan
driver binding documentation.
The next two patches are by me and target the flexcan driver aswell.
The remove the ack_grp and ack_bit from the fsl,stop-mode DT property
and the driver, as they are not used anymore. As these are the last
two arguments this change will not break existing device trees.
The last three patches are by Srinivas Neeli and target
the xilinx_can driver.
The first one increases the lower limit for the bit rate
prescaler to 2, the other two fix sparse and coverity findings.
====================
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a1511f71caf9..19a7b59ec456 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3917,6 +3917,7 @@ F: include/net/netns/can.h F: include/uapi/linux/can.h F: include/uapi/linux/can/bcm.h F: include/uapi/linux/can/gw.h +F: include/uapi/linux/can/isotp.h F: include/uapi/linux/can/raw.h F: net/can/ @@ -10680,14 +10681,14 @@ L: linux-input@vger.kernel.org S: Maintained F: drivers/hid/hid-mcp2221.c -MCP25XXFD SPI-CAN NETWORK DRIVER +MCP251XFD SPI-CAN NETWORK DRIVER M: Marc Kleine-Budde <mkl@pengutronix.de> M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> R: Thomas Kopp <thomas.kopp@microchip.com> L: linux-can@vger.kernel.org S: Maintained -F: Documentation/devicetree/bindings/net/can/microchip,mcp25xxfd.yaml -F: drivers/net/can/spi/mcp25xxfd/ +F: Documentation/devicetree/bindings/net/can/microchip,mcp251xfd.yaml +F: drivers/net/can/spi/mcp251xfd/ MCP4018 AND MCP4531 MICROCHIP DIGITAL POTENTIOMETER DRIVERS M: Peter Rosin <peda@axentia.se> |