From: David S. Miller Date: Thu, 29 Nov 2018 07:18:16 +0000 (-0800) Subject: Merge tag 'linux-can-next-for-4.21-20181128' of git://git.kernel.org/pub/scm/linux... X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=bd82233f16c4665f186c84fca68419f8cbe97f07;p=openwrt%2Fstaging%2Fblogic.git Merge tag 'linux-can-next-for-4.21-20181128' of git://git./linux/kernel/git/mkl/linux-can-next Marc Kleine-Budde says: ==================== This is a pull request for net-next/master consisting of 18 patches. The first patch is by Colin Ian King and fixes the spelling in the ucan driver. The next three patches target the xilinx driver. YueHaibing's patch fixes the return type of ndo_start_xmit function. Two patches by Shubhrajyoti Datta add support for the CAN FD 2.0 controllers. Flavio Suligoi's patch for the sja1000 driver add support for the ASEM CAN raw hardware. Wolfram Sang's and Kuninori Morimoto's patches switch the rcar driver to use SPDX license identifiers. The remaining 111 patches improve the flexcan driver. Pankaj Bansal's patch enables the driver in Kconfig on all architectures with IOMEM support. The next four patches by me fix indention, add missing parentheses and comments. Aisheng Dong's patches add self wake support and document it in the DT bindings. The remaining patches by Pankaj Bansal first fix the loopback support and prepare the driver for the CAN-FD support needed for the LX2160A SoC. The actual CAN-FD support will be added in a later patch series. ==================== Signed-off-by: David S. Miller --- bd82233f16c4665f186c84fca68419f8cbe97f07