David S. Miller a2d6d7ae59 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... The ungrafting from PRIO bug fixes in net, when merged into net-next, merge cleanly but create a build failure. The resolution used here is from Petr Machata. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-01-09 12:13:43 -08:00
..
cmd.h	mlxsw: cmd: Free running clock PCI BAR and offsets via query firmware	2019-06-13 22:34:55 -07:00
core_acl_flex_actions.c
core_acl_flex_actions.h
core_acl_flex_keys.c	mlxsw: spectrum_acl: Avoid size check for RX_ACL_SYSTEM_PORT element	2019-06-19 10:09:22 -04:00
core_acl_flex_keys.h	mlxsw: spectrum_acl: Fix SRC_SYS_PORT element size	2019-06-19 10:09:22 -04:00
core_env.c	mlxsw: core: Extend QSFP EEPROM size for ethtool	2019-10-22 10:30:41 -07:00
core_env.h
core_hwmon.c	mlxsw: hwmon: Provide optimization for QSFP modules number detection	2019-10-06 18:31:39 +02:00
core_thermal.c	mlxsw: thermal: Provide optimization for QSFP modules number detection	2019-10-06 18:31:39 +02:00
core.c	mlxsw: core: Add support for using EMAD string TLV	2019-11-12 10:54:02 -08:00
core.h	mlxsw: core: Add support for using EMAD string TLV	2019-11-12 10:54:02 -08:00
emad.h	mlxsw: core: Add EMAD string TLV	2019-11-12 10:54:02 -08:00
i2c.c	mlxsw: Propagate extack down to register_fib_notifier()	2019-10-04 11:10:56 -07:00
i2c.h
ib.h
item.h
Kconfig	mlxsw: spectrum: Extend to support Spectrum-3 ASIC	2019-08-08 22:27:09 -07:00
Makefile	mlxsw: spectrum: Add devlink-trap support	2019-08-21 12:58:39 -07:00
minimal.c	mlxsw: minimal: Add validation for FW version	2019-10-06 18:31:39 +02:00
pci_hw.h	mlxsw: pci: Increase PCI reset timeout for SN3800 systems	2019-10-30 12:07:05 -07:00
pci.c	mlxsw: Propagate extack down to register_fib_notifier()	2019-10-04 11:10:56 -07:00
pci.h	mlxsw: spectrum: Extend to support Spectrum-3 ASIC	2019-08-08 22:27:09 -07:00
port.h	mlxsw: spectrum: Use PMTM register to get max module width	2019-10-31 10:54:46 -07:00
reg.h	mlxsw: reg: Add QoS Port DSCP to Priority Mapping Register	2020-01-02 15:40:14 -08:00
resources.h	mlxsw: spectrum: Introduce resource for getting offset of 4 lanes split port	2019-10-31 10:54:47 -07:00
spectrum1_acl_tcam.c
spectrum1_kvdl.c
spectrum1_mr_tcam.c
spectrum2_acl_tcam.c
spectrum2_kvdl.c
spectrum2_mr_tcam.c
spectrum_acl_atcam.c
spectrum_acl_bloom_filter.c
spectrum_acl_ctcam.c
spectrum_acl_erp.c	mlxsw: spectrum_acl: Avoid warning after identical rules insertion	2019-05-30 12:30:47 -07:00
spectrum_acl_flex_actions.c
spectrum_acl_flex_actions.h
spectrum_acl_flex_keys.c	mlxsw: spectrum_acl: Fix SRC_SYS_PORT element size	2019-06-19 10:09:22 -04:00
spectrum_acl_tcam.c
spectrum_acl_tcam.h
spectrum_acl.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-08-19 11:54:03 -07:00
spectrum_buffers.c	mlxsw: Fix 64-bit division in mlxsw_sp_sb_prs_init	2019-10-31 13:55:34 -07:00
spectrum_cnt.c
spectrum_cnt.h
spectrum_dcb.c	mlxsw: spectrum_dcb: Allow setting default port priority	2020-01-02 15:40:14 -08:00
spectrum_dpipe.c
spectrum_dpipe.h
spectrum_fid.c	mlxsw: spectrum: Do not process learned records with a dummy FID	2019-07-17 15:19:46 -07:00
spectrum_flower.c	mlxsw: spectrum_flower: Fail in case user specifies multiple mirror actions	2019-09-27 20:33:19 +02:00
spectrum_ipip.c
spectrum_ipip.h
spectrum_kvdl.c
spectrum_mr_tcam.c
spectrum_mr_tcam.h
spectrum_mr.c
spectrum_mr.h
spectrum_nve_vxlan.c	mlxsw: spectrum_ptp: Increase parsing depth when PTP is enabled	2019-07-29 13:55:05 -07:00
spectrum_nve.c	mlxsw: spectrum: Take devlink net instead of init_net	2019-10-04 11:10:56 -07:00
spectrum_nve.h	mlxsw: spectrum_ptp: Increase parsing depth when PTP is enabled	2019-07-29 13:55:05 -07:00
spectrum_ptp.c	net: Introduce peer to peer one step PTP time stamping.	2019-12-25 19:51:34 -08:00
spectrum_ptp.h	mlxsw: spectrum_ptp: Add counters for GC events	2019-08-28 18:24:04 -07:00
spectrum_qdisc.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-01-09 12:13:43 -08:00
spectrum_router.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-12-31 13:37:13 -08:00
spectrum_router.h
spectrum_span.c	mlxsw: spectrum: Register switched port analyzers (SPAN) as resource	2019-10-18 10:05:37 -07:00
spectrum_span.h
spectrum_switchdev.c	mlxsw: spectrum: Take devlink net instead of init_net	2019-10-04 11:10:56 -07:00
spectrum_switchdev.h
spectrum_trap.c	mlxsw: Add layer 3 devlink-trap exceptions support	2019-11-07 19:51:40 -08:00
spectrum.c	mlxsw: spectrum: Disable DIP_LINK_LOCAL check in hardware pipeline	2020-01-06 13:38:37 -08:00
spectrum.h	mlxsw: spectrum_qdisc: Support offloading of ETS Qdisc	2019-12-18 13:32:30 -08:00
switchib.c	mlxsw: Propagate extack down to register_fib_notifier()	2019-10-04 11:10:56 -07:00
switchx2.c	mlxsw: Propagate extack down to register_fib_notifier()	2019-10-04 11:10:56 -07:00
trap.h	mlxsw: spectrum: Disable DIP_LINK_LOCAL check in hardware pipeline	2020-01-06 13:38:37 -08:00
txheader.h