linux_dsm_epyc7002/drivers/net/ethernet/intel/i40e
David S. Miller 2be09de7d6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Lots of conflicts, by happily all cases of overlapping
changes, parallel adds, things of that nature.

Thanks to Stephen Rothwell, Saeed Mahameed, and others
for their guidance in these resolutions.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-12-20 11:53:36 -08:00
..
i40e_adminq_cmd.h i40e: Add capability flag for stopping FW LLDP 2018-11-14 10:56:33 -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_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_nl.c i40e/i40evf: cleanup incorrect function doxygen comments 2018-04-30 09:09:04 -07: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_debugfs.c i40e: Remove unnecessary print statement 2018-10-03 12:33:34 -07: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: always set ks->base.speed in i40e_get_settings_link_up 2018-11-14 10:56:33 -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 2018-12-20 11:53:36 -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: Replace strncpy with strlcpy to ensure null termination 2018-11-14 10:56:33 -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_common.h i40e: DRY rx_ptype handling code 2018-12-12 15:46:02 -08:00
i40e_txrx.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2018-12-20 11:53:36 -08:00
i40e_txrx.h i40e: add AF_XDP zero-copy Rx support 2018-08-29 12:25:53 -07: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: suppress bogus error message 2018-11-14 10:56:34 -08:00
i40e_virtchnl_pf.h i40e: Use correct shift for VLAN priority 2018-11-14 10:56:33 -08:00
i40e_xsk.c i40e: DRY rx_ptype handling code 2018-12-12 15:46:02 -08:00
i40e_xsk.h i40e: add AF_XDP zero-copy Tx support 2018-08-29 12:25:53 -07:00
i40e.h i40e: prevent overlapping tx_timeout recover 2018-11-14 10:56:34 -08:00
Makefile i40e: add AF_XDP zero-copy Rx support 2018-08-29 12:25:53 -07:00