Merge tag 'linux-can-next-for-4.7-20160509' of...
Merge tag 'linux-can-next-for-4.7-20160509' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next Marc Kleine-Budde says: ==================== pull-request: can-next 2016-05-09 this is a pull request of 12 patches for net-next/master. Alexander Gerasiov and Nikita Edward Baruzdin each contribute a patch improving the sja1000 driver. Amitoj Kaur Chawla's patch converts the mcp251x driver to alloc_workqueue(). A patch by Oliver Hartkopp fixes the handling of CAN config options. Andreas Gröger improves the error handling in the janz-ican3 driver. The patch by Maximilian Schneider for the gs_usb improves probing of the USB driver. Finally there are 6 improvement patches by Marek Vasut for the ifi CAN driver. ==================== Signed-off-by:David S. Miller <davem@davemloft.net>
No related branches found
No related tags found
Showing
- drivers/net/can/dev.c 52 additions, 4 deletionsdrivers/net/can/dev.c
- drivers/net/can/ifi_canfd/ifi_canfd.c 134 additions, 53 deletionsdrivers/net/can/ifi_canfd/ifi_canfd.c
- drivers/net/can/janz-ican3.c 95 additions, 9 deletionsdrivers/net/can/janz-ican3.c
- drivers/net/can/m_can/m_can.c 1 addition, 1 deletiondrivers/net/can/m_can/m_can.c
- drivers/net/can/sja1000/plx_pci.c 56 additions, 8 deletionsdrivers/net/can/sja1000/plx_pci.c
- drivers/net/can/sja1000/sja1000.c 5 additions, 1 deletiondrivers/net/can/sja1000/sja1000.c
- drivers/net/can/spi/mcp251x.c 2 additions, 1 deletiondrivers/net/can/spi/mcp251x.c
- drivers/net/can/usb/gs_usb.c 2 additions, 1 deletiondrivers/net/can/usb/gs_usb.c
- include/linux/can/dev.h 20 additions, 2 deletionsinclude/linux/can/dev.h
Loading
Please register or sign in to comment