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

Conflicts were two cases of simple overlapping changes,
nothing serious.

In the UDP case, we need to add a hlist_add_tail_rcu()
to linux/rculist.h, because we've moved UDP socket handling
away from using nulls lists.

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

2016-04-23 18:51:33 -04:00

..

i40e_adminq_cmd.h

i40e: add adminq commands for Rx CTL registers

2016-02-18 23:55:59 -08:00

i40e_adminq.c

i40e: Move NVM event wait check to NVM code

2016-04-06 19:00:42 -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

i40e: Add support for client interface for IWARP driver

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

i40e_client.h

i40e: Add support for client interface for IWARP driver

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

i40e_common.c

i40e: Inserting a HW capability display info

2016-04-06 17:54:14 -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: remove redundant check on vsi->active_vlans

2016-04-05 18:52:14 -07:00

i40e_devids.h

i40e: Add new device ID for X722

2016-04-05 20:33:14 -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: Fix for supported link modes in 10GBaseT PHY's

2016-04-05 20:33:43 -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: clean up unneeded gotos

2015-07-23 05:15:26 -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-04-09 17:41:41 -04:00

i40e_nvm.c

i40e: Move NVM event wait check to NVM code

2016-04-06 19:00:42 -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: Move NVM event wait check to NVM code

2016-04-06 19:00:42 -07:00

i40e_ptp.c

i40e: generate fewer startup messages

2015-10-16 04:36:13 -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

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

2016-04-23 18:51:33 -04:00

i40e_txrx.h

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

2016-04-23 18:51:33 -04:00

i40e_type.h

i40e: Input set mask constants for RSS, flow director, and flex bytes

2016-04-06 19:09:13 -07:00

i40e_virtchnl_pf.c

i40e: Restrict VF poll mode to only single function mode devices

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

i40e_virtchnl_pf.h

i40e: Patch to support trusted VF

2016-04-06 18:31: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: Remove I40E_MAX_USER_PRIORITY define

2016-04-05 02:12:59 -07:00

Makefile

i40e: Add support for client interface for IWARP driver

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