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

Conflicts:
	drivers/net/ethernet/mediatek/mtk_eth_soc.c
	drivers/net/ethernet/qlogic/qed/qed_dcbx.c
	drivers/net/phy/Kconfig

All conflicts were cases of overlapping commits.

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

2016-09-12 15:52:44 -07:00

..

i40e_adminq_cmd.h

i40e: Add support for HMC resource and profile for X722

2016-08-19 21:26:58 -07:00

i40e_adminq.c

i40e: Remove HMC AQ API implementation

2016-05-01 17:03:55 -07:00

i40e_adminq.h

i40e: Move NVM variable out of AQ struct

2016-04-06 18:45:11 -07:00

i40e_alloc.h

i40e: Fix GPL header

2014-01-09 02:10:23 -08:00

i40e_client.c

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

2016-08-30 00:54:02 -04:00

i40e_client.h

i40e: Remove XSTRINGIFY macro definitions and uses

2016-08-19 21:39:03 -07:00

i40e_common.c

i40e: Remove device ID 0x37D4

2016-07-22 00:07:04 -07:00

i40e_dcb_nl.c

i40e: Change some messages from info to debug only

2015-10-15 01:58:41 -07:00

i40e_dcb.c

i40e: refactor DCB function

2016-02-16 19:04:08 -08:00

i40e_dcb.h

i40e: Add parsing for CEE DCBX TLVs

2015-10-08 15:11:38 -07:00

i40e_debugfs.c

i40e: refactor Rx filter handling

2016-07-22 00:07:04 -07:00

i40e_devids.h

i40e: Remove device ID 0x37D4

2016-07-22 00:07:04 -07:00

i40e_diag.c

i40e: use BIT and BIT_ULL macros

2015-07-23 05:33:55 -07:00

i40e_diag.h

i40e: Fix GPL header

2014-01-09 02:10:23 -08:00

i40e_ethtool.c

i40e: use matching format identifiers

2016-08-19 21:32:46 -07:00

i40e_fcoe.c

i40e/i40evf: Faster RX via avoiding FCoE

2016-04-06 18:26:23 -07:00

i40e_fcoe.h

i40e: use BIT and BIT_ULL macros

2015-07-23 05:33:55 -07:00

i40e_hmc.c

i40e: fix an uninitialized variable bug

2016-05-14 00:21:51 -07:00

i40e_hmc.h

i40e: use BIT and BIT_ULL macros

2015-07-23 05:33:55 -07:00

i40e_lan_hmc.c

i40e: use explicit cast from u16 to u8

2015-12-12 21:08:26 -08:00

i40e_lan_hmc.h

i40e/i40evf: Big endian fixes for handling HMC

2014-06-26 04:44:57 -07:00

i40e_main.c

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

2016-09-12 15:52:44 -07:00

i40e_nvm.c

i40e: Specify AQ event opcode to wait for

2016-04-26 09:15:39 -07:00

i40e_osdep.h

move io-64-nonatomic*.h out of asm-generic

2015-10-15 00:21:07 +02:00

i40e_prototype.h

i40e: add functions to control default VSI

2016-06-27 15:08:28 -07:00

i40e_ptp.c

i40e: change Rx hang message into a WARN_ONCE

2016-05-13 23:44:59 -07:00

i40e_register.h

i40e: Expose some registers to program parser, FD and RSS logic

2016-02-18 23:49:31 -08:00

i40e_status.h

i40e: Fix GPL header

2014-01-09 02:10:23 -08:00

i40e_txrx.c

i40e: refactor tail_bump check

2016-08-19 21:24:28 -07:00

i40e_txrx.h

i40e/i40evf: Remove unused hardware receive descriptor code

2016-05-05 22:59:54 -07:00

i40e_type.h

i40e/i40evf: fix I40E_MASK signed shift overflow warnings

2016-05-01 17:05:08 -07:00

i40e_virtchnl_pf.c

i40e: Expose 'trust' flag to userspace via ndo_get_vf_config.

2016-08-18 11:43:14 -07:00

i40e_virtchnl_pf.h

i40e: Use consistent type for vf_id

2016-05-01 17:05:06 -07:00

i40e_virtchnl.h

i40e: Add RSS configuration to virtual channel

2016-04-06 18:55:18 -07:00

i40e.h

i40e/i40evf: Fix indentation

2016-08-19 21:47:41 -07:00

Makefile

i40e: Add support for client interface for IWARP driver

2016-02-29 17:10:52 -05:00