Merge tag 'linux-can-next-for-5.13-20210330' of...
Merge tag 'linux-can-next-for-5.13-20210330' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next Marc Kleine-Budde says: ==================== pull-request: can-next 2021-03-30 this is a pull request of 39 patches for net-next/master. The first two patches update the MAINTAINERS file. One is by me and removes Dan Murphy from the from m_can and tcan4x5x. The other one is by Pankaj Sharma and updates the maintainership of the m-can mmio driver. The next three patches are by me and update the CAN echo skb handling. Vincent Mailhol provides 5 patches where Transmitter Delay Compensation is added CAN bittiming calculation is cleaned up. The next patch is by me and adds a missing HAS_IOMEM to the grcan driver. Michal Simek's patch for the xilinx driver add dev_err_probe() support. Arnd Bergmann's patch for the ucan driver fixes a compiler warning. Stephane Grosjean provides 3 patches for the peak USB drivers, which add ethtool set_phys_id and CAN one-shot mode. Xulin Sun's patch removes a not needed return check in the m-can driver. Torin Cooper-Bennun provides 3 patches for the m-can driver that add rx-offload support to ensure that skbs are sent from softirq context. Wan Jiabing's patch for the tcan4x5x driver removes a duplicate include. The next 6 patches are by me and target the mcp251xfd driver. They add devcoredump support, simplify the UINC handling, and add HW timestamp support. The remaining 12 patches target the c_can driver. The first 6 are by me and do generic checkpatch related cleanup work. Dario Binacchi's patches bring some cleanups and increase the number of usable message objects from 16 to 64. ==================== Signed-off-by:David S. Miller <davem@davemloft.net>
No related branches found
No related tags found
Showing
- MAINTAINERS 1 addition, 9 deletionsMAINTAINERS
- drivers/net/can/Kconfig 1 addition, 1 deletiondrivers/net/can/Kconfig
- drivers/net/can/c_can/c_can.c 77 additions, 76 deletionsdrivers/net/can/c_can/c_can.c
- drivers/net/can/c_can/c_can.h 18 additions, 24 deletionsdrivers/net/can/c_can/c_can.h
- drivers/net/can/c_can/c_can_pci.c 17 additions, 14 deletionsdrivers/net/can/c_can/c_can_pci.c
- drivers/net/can/c_can/c_can_platform.c 5 additions, 1 deletiondrivers/net/can/c_can/c_can_platform.c
- drivers/net/can/dev/bittiming.c 26 additions, 2 deletionsdrivers/net/can/dev/bittiming.c
- drivers/net/can/dev/netlink.c 13 additions, 14 deletionsdrivers/net/can/dev/netlink.c
- drivers/net/can/dev/skb.c 22 additions, 5 deletionsdrivers/net/can/dev/skb.c
- drivers/net/can/grcan.c 1 addition, 1 deletiondrivers/net/can/grcan.c
- drivers/net/can/m_can/m_can.c 138 additions, 22 deletionsdrivers/net/can/m_can/m_can.c
- drivers/net/can/m_can/m_can.h 2 additions, 0 deletionsdrivers/net/can/m_can/m_can.h
- drivers/net/can/m_can/tcan4x5x.h 0 additions, 1 deletiondrivers/net/can/m_can/tcan4x5x.h
- drivers/net/can/rcar/rcar_can.c 1 addition, 1 deletiondrivers/net/can/rcar/rcar_can.c
- drivers/net/can/rcar/rcar_canfd.c 1 addition, 1 deletiondrivers/net/can/rcar/rcar_canfd.c
- drivers/net/can/sja1000/sja1000.c 1 addition, 1 deletiondrivers/net/can/sja1000/sja1000.c
- drivers/net/can/spi/hi311x.c 1 addition, 1 deletiondrivers/net/can/spi/hi311x.c
- drivers/net/can/spi/mcp251x.c 1 addition, 1 deletiondrivers/net/can/spi/mcp251x.c
- drivers/net/can/spi/mcp251xfd/Kconfig 1 addition, 0 deletionsdrivers/net/can/spi/mcp251xfd/Kconfig
- drivers/net/can/spi/mcp251xfd/Makefile 3 additions, 0 deletionsdrivers/net/can/spi/mcp251xfd/Makefile
Loading
Please register or sign in to comment