OpenCloudOS-Kernel/drivers/net/ethernet/intel/i40e
David S. Miller 70f3522614 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Three conflicts, one of which, for marvell10g.c is non-trivial and
requires some follow-up from Heiner or someone else.

The issue is that Heiner converted the marvell10g driver over to
use the generic c45 code as much as possible.

However, in 'net' a bug fix appeared which makes sure that a new
local mask (MDIO_AN_10GBT_CTRL_ADV_NBT_MASK) with value 0x01e0
is cleared.

Signed-off-by: David S. Miller <davem@davemloft.net>
2019-02-24 12:06:19 -08:00
..
Makefile i40e: add AF_XDP zero-copy Rx support 2018-08-29 12:25:53 -07:00
i40e.h i40e: Add support FEC configuration for Fortville 25G 2019-01-22 07:38:38 -08:00
i40e_adminq.c i40e: Add capability flag for stopping FW LLDP 2018-11-14 10:56:33 -08:00
i40e_adminq.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
i40e_adminq_cmd.h i40e: Add capability flag for stopping FW LLDP 2018-11-14 10:56:33 -08:00
i40e_alloc.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
i40e_client.c i40e/i40evf: cleanup incorrect function doxygen comments 2018-04-30 09:09:04 -07:00
i40e_client.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
i40e_common.c i40e: Allow disabling FW LLDP on X722 devices 2018-11-14 10:56:33 -08:00
i40e_dcb.c i40e: fix reading LLDP configuration 2018-04-30 09:12:33 -07:00
i40e_dcb.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
i40e_dcb_nl.c i40e/i40evf: cleanup incorrect function doxygen comments 2018-04-30 09:09:04 -07:00
i40e_debugfs.c i40e: remove debugfs tx_timeout support 2019-01-22 07:55:22 -08:00
i40e_devids.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
i40e_diag.c net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
i40e_diag.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
i40e_ethtool.c i40e: clean up several indentation issues 2019-01-22 08:42:03 -08:00
i40e_hmc.c i40e/i40evf: cleanup incorrect function doxygen comments 2018-04-30 09:09:04 -07:00
i40e_hmc.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
i40e_lan_hmc.c net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
i40e_lan_hmc.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
i40e_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2019-02-24 12:06:19 -08:00
i40e_nvm.c i40e/i40evf: cleanup incorrect function doxygen comments 2018-04-30 09:09:04 -07:00
i40e_osdep.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
i40e_prototype.h i40e: Add AQ command for rearrange NVM structure 2018-08-07 12:20:45 -07:00
i40e_ptp.c i40e: extend PTP gettime function to read system clock 2018-12-20 12:06:35 -08:00
i40e_register.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
i40e_status.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
i40e_trace.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
i40e_txrx.c i40e: fix XDP_REDIRECT/XDP xmit ring cleanup race 2019-02-21 11:07:49 -08:00
i40e_txrx.h i40e: add AF_XDP zero-copy Rx support 2018-08-29 12:25:53 -07:00
i40e_txrx_common.h i40e: DRY rx_ptype handling code 2018-12-12 15:46:02 -08:00
i40e_type.h i40e: Add capability flag for stopping FW LLDP 2018-11-14 10:56:33 -08:00
i40e_virtchnl_pf.c i40e: clean up several indentation issues 2019-01-22 08:42:03 -08:00
i40e_virtchnl_pf.h i40e: Use correct shift for VLAN priority 2018-11-14 10:56:33 -08:00
i40e_xsk.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2019-02-24 12:06:19 -08:00
i40e_xsk.h net: bpf: remove XDP_QUERY_XSK_UMEM enumerator 2019-02-15 15:14:22 +01:00