leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
adc01582e3
linux/drivers/net/ethernet/mellanox/mlxsw
History
David S. Miller 1578b0a5e9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	net/sched/act_police.c
	net/sched/sch_drr.c
	net/sched/sch_hfsc.c
	net/sched/sch_prio.c
	net/sched/sch_red.c
	net/sched/sch_tbf.c

In net-next the drop methods of the packet schedulers got removed, so
the bug fixes to them in 'net' are irrelevant.

A packet action unload crash fix conflicts with the addition of the
new firstuse timestamp.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-06-10 11:52:24 -07:00
..
cmd.h mlxsw: cmd: Introduce FID-offset flooding tables 2015-10-16 07:15:10 -07:00
core_hwmon.c mlxsw: core: remove an unnecessary condition 2016-01-06 15:07:47 -05:00
core.c mlxsw: core: Remove deprecated create_workqueue 2016-06-09 23:49:43 -07:00
core.h mlxsw: core: Introduce support for asynchronous EMAD register access 2016-04-14 16:22:06 -04:00
emad.h mlxsw: Add interface to access registers and process events 2015-07-30 00:05:00 -07:00
item.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-10-20 06:08:27 -07:00
Kconfig mlxsw: spectrum: Introduce support for Data Center Bridging (DCB) 2016-04-06 17:24:18 -04:00
Makefile mlxsw: spectrum: Introduce support for Data Center Bridging (DCB) 2016-04-06 17:24:18 -04:00
pci.c mlxsw: pci: Implement reset done check 2016-03-13 22:30:01 -04:00
pci.h mlxsw: pci: Implement reset done check 2016-03-13 22:30:01 -04:00
port.h mlxsw: spectrum: Introduce port splitting 2016-03-01 16:07:31 -05:00
reg.h mlxsw: reg: Extend SBPM register for occupancy control 2016-04-14 16:22:06 -04:00
spectrum_buffers.c mlxsw: spectrum_buffers: Use MLXSW_SP_PB_UNUSED define for unused pb 2016-04-15 13:02:43 -04:00
spectrum_dcb.c mlxsw: spectrum: Add IEEE 802.1Qbb PFC support 2016-04-06 17:24:20 -04:00
spectrum_switchdev.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-05-09 15:59:24 -04:00
spectrum.c mlxsw: spectrum: Don't sleep during ndo_get_phys_port_name() 2016-06-09 11:20:05 -07:00
spectrum.h mlxsw: spectrum: Don't sleep during ndo_get_phys_port_name() 2016-06-09 11:20:05 -07:00
switchx2.c mlxsw: Do not pass around driver_priv directly 2016-04-08 15:38:42 -04:00
trap.h
txheader.h mlxsw: spectrum: Add initial support for Spectrum ASIC 2015-10-16 07:15:23 -07:00