OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
linux/net/dsa
History
David S. Miller 54e5c4def0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/bonding/bond_alb.c
	drivers/net/ethernet/altera/altera_msgdma.c
	drivers/net/ethernet/altera/altera_sgdma.c
	net/ipv6/xfrm6_output.c

Several cases of overlapping changes.

The xfrm6_output.c has a bug fix which overlaps the renaming
of skb->local_df to skb->ignore_df.

In the Altera TSE driver cases, the register access cleanups
in net-next overlapped with bug fixes done in net.

Similarly a bug fix to send ALB packets in the bonding driver using
the right source address overlaps with cleanups in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>
 		2014-05-24 00:32:30 -04:00
..
Kconfig dsa: Hide core config options; make drivers select what they need 2012-11-26 17:10:44 -05:00
Makefile dsa: Move switch drivers to new directory drivers/net/dsa 2011-11-29 00:21:36 -05:00
dsa.c net/dsa/dsa.c: increment chip_index during of_node handling on dsa_of_probe() 2014-05-16 16:56:33 -04:00
dsa_priv.h dsa: Move all definitions needed by drivers into <net/dsa.h> 2011-11-29 00:21:36 -05:00
slave.c net: get rid of SET_ETHTOOL_OPS 2014-05-13 17:43:20 -04:00
tag_dsa.c dsa: Combine core and tagging code 2011-11-26 14:48:15 -05:00
tag_edsa.c dsa: Combine core and tagging code 2011-11-26 14:48:15 -05:00
tag_trailer.c dsa: Combine core and tagging code 2011-11-26 14:48:15 -05:00