summaryrefslogtreecommitdiff
path: root/net/batman-adv/netlink.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2018-07-29 08:35:03 -0700
committerDavid S. Miller <davem@davemloft.net>2018-07-29 08:35:03 -0700
commit41627cdb02cdff8cb92a498bc3bcbef8abe8a752 (patch)
treed7a39d946c18c4c8e875d37f21607295b6e4ae38 /net/batman-adv/netlink.h
parent4be90c79d6de941216fdaeb0e76647c48877ffd5 (diff)
parent1f6ed42c742e8d1cfd3811ef7a134eaa75a511d6 (diff)
Merge tag 'linux-can-next-for-4.19-20180727' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says: ==================== pull-request: can-next 2018-01-16 this is a pull request for net-next/master consisting of 38 patches. Dan Murphy's patch fixes the path to a file in the comment of the CAN Error Message Frame Mask structure. A patch by Colin Ian King fixes a typo in the cc770 driver. The next patch is by me an sorts the Kconfigand Makefile entries of the CAN-USB driver subdir alphabetically. The patch by Jakob Unterwurzacher adds support for the UCAN USB-CAN adapter. YueHaibing's patch replaces a open coded skb_put()+memset() by skb_put_zero() in the CAN-dev infrastructure. Zhu Yi provides a patch to enable multi-queue CAN devices. Three patches by Luc Van Oostenryck fix the return value of several driver's xmit function, I contribute a patch for the a fourth driver. Fabio Estevam's patch switches the flexcan driver to SPDX identifier. Two patches by Jia-Ju Bai replace the mdelay() by a usleep_range() in the sja1000 drivers. The next 6 patches are by Anssi Hannula and refactor the xilinx CAN driver and add support for the xilinx CAN FD core. A patch by Gustavo A. R. Silva adds fallthrough annotation to the peak_usb driver. 5 patches by Stephane Grosjean for the peak CANFD driver do some cleanups and provide more improvements for further firmware releases. The remaining 13 patches are by Jimmy Assarsson and the first clean up the kvaser_usb driver, so that the later patches add support for the Kvaser USB hydra family. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/netlink.h')
0 files changed, 0 insertions, 0 deletions