Merge tag 'linux-can-fixes-for-5.15-20211017' of...
Merge tag 'linux-can-fixes-for-5.15-20211017' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can Marc Kleine-Budde says: ==================== pull-request: can 2021-10-17 this is a pull request of 11 patches for net/master. The first 4 patches are by Ziyang Xuan and Zhang Changzhong and fix 1 use after free and 3 standard conformance problems in the j1939 CAN stack. The next 2 patches are by Ziyang Xuan and fix 2 concurrency problems in the ISOTP CAN stack. Yoshihiro Shimoda's patch for the rcar_can fix suspend/resume on not running CAN interfaces. Aswath Govindraju's patch for the m_can driver fixes access for MMIO devices. Zheyu Ma contributes a patch for the peak_pci driver to fix a use after free. Stephane Grosjean's 2 patches fix CAN error state handling in the peak_usb driver. ==================== Signed-off-by:David S. Miller <davem@davemloft.net>
No related branches found
No related tags found
Showing
- drivers/net/can/m_can/m_can_platform.c 12 additions, 2 deletionsdrivers/net/can/m_can/m_can_platform.c
- drivers/net/can/rcar/rcar_can.c 12 additions, 8 deletionsdrivers/net/can/rcar/rcar_can.c
- drivers/net/can/sja1000/peak_pci.c 4 additions, 5 deletionsdrivers/net/can/sja1000/peak_pci.c
- drivers/net/can/usb/peak_usb/pcan_usb_fd.c 3 additions, 5 deletionsdrivers/net/can/usb/peak_usb/pcan_usb_fd.c
- net/can/isotp.c 33 additions, 15 deletionsnet/can/isotp.c
- net/can/j1939/j1939-priv.h 1 addition, 0 deletionsnet/can/j1939/j1939-priv.h
- net/can/j1939/main.c 5 additions, 2 deletionsnet/can/j1939/main.c
- net/can/j1939/transport.c 9 additions, 5 deletionsnet/can/j1939/transport.c
Loading
Please register or sign in to comment