David S. Miller 8565d26bcb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The BPF verifier conflict was some minor contextual issue. The TUN conflict was less trivial. Cong Wang fixed a memory leak of tfile->tx_array in 'net'. This is an skb_array. But meanwhile in net-next tun changed tfile->tx_arry into tfile->tx_ring which is a ptr_ring. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-01-19 22:59:33 -05:00
..
c_can	can: c_can_pci: make c_can_pci_data const	2017-12-01 09:14:22 +01:00
cc770	Annotate hardware config module parameters in drivers/net/can/	2017-04-20 12:02:32 +01:00
ifi_canfd	can: ifi: Fix transmitter delay calculation	2017-11-10 11:35:09 +01:00
m_can	can: m_can: mark runtime-PM handlers as __maybe_unused	2018-01-19 10:41:15 +01:00
mscan	treewide: replace dev->trans_start update with helper	2016-05-04 14:16:49 -04:00
peak_canfd	can: peak/pcie_fd: fix potential bug in restarting tx queue	2017-12-08 10:51:53 +01:00
rcar	scripts/spelling.txt: add regsiter -> register spelling mistake	2017-05-08 17:15:13 -07:00
sja1000	can: peak/pci: fix potential bug when probe() fails	2017-12-01 11:20:52 +01:00
softing	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
spi	can: mcp251x: mcp251x_setup(): remove unused parameter "struct mcp251x_priv *priv"	2018-01-05 11:12:08 +01:00
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-01-19 22:59:33 -05:00
at91_can.c	net: can: at91_can: constify attribute_group structures.	2017-07-18 12:04:56 -07:00
bfin_can.c	can: remove obsolete assignment for CAN protocol error type	2015-11-23 09:37:38 +01:00
dev.c	can: dev: Add support for limiting configured bitrate	2018-01-16 15:11:32 +01:00
flexcan.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-01-09 10:37:00 -05:00
grcan.c	drivers/net: can: Convert timers to use timer_setup()	2017-10-27 12:09:15 +09:00
janz-ican3.c	net: can: janz-ican3: constify attribute_group structures.	2017-07-18 12:04:56 -07:00
Kconfig	can: add Virtual CAN Tunnel driver (vxcan)	2017-04-25 09:04:30 +02:00
led.c	can: add combined rx/tx LED trigger support	2015-03-22 23:50:11 +01:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
pch_can.c	can: fix assignment of error location in CAN error messages	2015-11-23 09:37:34 +01:00
rx-offload.c	can: rx-offload: can_rx_offload_add_timestamp: remove duplicate semicolon at return statement	2018-01-05 11:12:08 +01:00
slcan.c	can: slcan: slc_alloc(): remove unused parameter "dev_t line"	2018-01-05 11:12:08 +01:00
sun4i_can.c	can: sun4i: handle overrun in RX FIFO	2017-11-10 09:15:28 +01:00
ti_hecc.c	can: ti_hecc: Fix napi poll return value for repoll	2017-12-01 11:20:52 +01:00
vcan.c	can: enable CAN FD for virtual CAN devices by default	2017-06-09 14:39:02 +02:00
vxcan.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-01-09 10:37:00 -05:00
xilinx_can.c	drivers: net: generalize napi_complete_done()	2017-01-30 15:10:42 -05:00