David S. Miller 4e8f2fc1a5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Two trivial overlapping changes conflicts in MPLS and mlx5.

Signed-off-by: David S. Miller <davem@davemloft.net>

2017-01-28 10:33:06 -05:00

..

dsa2.c

net: dsa: Move ports assignment closer to error checking

2017-01-26 15:43:53 -05:00

dsa_priv.h

net: dsa: Make most functions take a dsa_port argument

2017-01-26 15:43:53 -05:00

dsa.c

net: dsa: Make most functions take a dsa_port argument

2017-01-26 15:43:53 -05:00

Kconfig

net: dsa: Remove hwmon support

2017-01-20 14:42:51 -05:00

Makefile

net: dsa: Remove hwmon support

2017-01-20 14:42:51 -05:00

slave.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-01-28 10:33:06 -05:00

tag_brcm.c

net: dsa: Drop WARN() in tag_brcm.c

2017-01-24 15:00:22 -05:00

tag_dsa.c

net: dsa: Add a ports structure and use it in the switch structure

2016-06-04 14:29:53 -07:00

tag_edsa.c

net: dsa: Add a ports structure and use it in the switch structure

2016-06-04 14:29:53 -07:00

tag_qca.c

net: dsa: use cpu_switch instead of ds[0]

2017-01-18 16:49:47 -05:00

tag_trailer.c

net: dsa: use cpu_switch instead of ds[0]

2017-01-18 16:49:47 -05:00