FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-25 10:59:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
c1f8667677
linux/net/dsa
History
David S. Miller c85d6975ef Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/mellanox/mlx4/cmd.c
	net/core/fib_rules.c
	net/ipv4/fib_frontend.c

The fib_rules.c and fib_frontend.c conflicts were locking adjustments
in 'net' overlapping addition and removal of code in 'net-next'.

The mlx4 conflict was a bug fix in 'net' happening in the same
place a constant was being replaced with a more suitable macro.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-04-06 22:34:15 -04:00
..
dsa_priv.h net: dsa: integrate with SWITCHDEV for HW bridging 2015-02-25 17:03:38 -05:00
dsa.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-04-06 22:34:15 -04:00
Kconfig net: dsa: make NET_DSA manually selectable from the config 2015-03-20 21:37:58 -04:00
Makefile net: dsa: add Broadcom tag RX/TX handler 2014-08-27 22:59:40 -07:00
slave.c dsa: implement ndo_get_iflink 2015-04-02 14:05:01 -04:00
tag_brcm.c dsa: Split ops up, and avoid assigning tag_protocol and receive separately 2014-09-15 17:24:20 -04:00
tag_dsa.c net: dsa: Don't set skb->protocol on outgoing tagged packets 2014-10-30 14:54:10 -04:00
tag_edsa.c net: dsa: Don't set skb->protocol on outgoing tagged packets 2014-10-30 14:54:10 -04:00
tag_trailer.c net: dsa: Don't set skb->protocol on outgoing tagged packets 2014-10-30 14:54:10 -04:00