korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-24 11:34:50 +08:00
Code Issues Packages Projects Releases Wiki Activity
19a6d156a7
linux/drivers/net/ethernet/cavium/thunder
History
David S. Miller b3e0d3d7ba Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/geneve.c

Here we had an overlapping change, where in 'net' the extraneous stats
bump was being removed whilst in 'net-next' the final argument to
udp_tunnel6_xmit_skb() was being changed.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-12-17 22:08:28 -05:00
..
Makefile
nic_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-12-17 22:08:28 -05:00
nic_reg.h net: thunderx: Incorporate pass2 silicon CPI index configuration changes 2015-10-25 18:13:02 -07:00
nic.h net: thunderx: HW TSO support for pass-2 hardware 2015-12-11 23:38:17 -05:00
nicvf_ethtool.c net: thunderx: Switchon carrier only upon interface link up 2015-12-02 15:58:50 -05:00
nicvf_main.c net: thunderx: HW TSO support for pass-2 hardware 2015-12-11 23:38:17 -05:00
nicvf_queues.c net: thunderx: Enable CQE count threshold interrupt 2015-12-11 23:38:17 -05:00
nicvf_queues.h net: thunderx: Enable CQE count threshold interrupt 2015-12-11 23:38:17 -05:00
q_struct.h net: thunderx: HW TSO support for pass-2 hardware 2015-12-11 23:38:17 -05:00
thunder_bgx.c net: thunderx: Enable BGX LMAC's RX/TX only after VF is up 2015-12-02 15:58:50 -05:00
thunder_bgx.h net: thunderx: Enable BGX LMAC's RX/TX only after VF is up 2015-12-02 15:58:50 -05:00