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

The UDP offload conflict is dealt with by simply taking what is
in net-next where we have removed all of the UFO handling code
entirely.

The TCP conflict was a case of local variables in a function
being removed from both net and net-next.

In netvsc we had an assignment right next to where a missing
set of u64 stats sync object inits were added.

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

2017-08-09 16:28:45 -07:00

..

i40e_adminq_cmd.h

i40e/i40evf: update WOL and I40E_AQC_ADDR_VALID_MASK flags

2017-06-20 18:17:10 -07:00

i40e_adminq.c

i40e: reduce wait time for adminq command completion

2017-04-19 17:38:25 -07:00

i40e_adminq.h

i40e: reduce wait time for adminq command completion

2017-04-19 17:38:25 -07:00

i40e_alloc.h

i40e: Fix GPL header

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

i40e_client.c

i40e: use dev_dbg instead of dev_info when warning about missing routine

2017-06-20 18:17:10 -07:00

i40e_client.h

i40e: KISS the client interface

2017-03-15 01:57:08 -07:00

i40e_common.c

i40e: comment that udp_port must be in host byte order

2017-06-20 18:17:10 -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: Support firmware CEE DCB UP to TC map re-definition

2017-06-20 18:17:10 -07:00

i40e_dcb.h

i40e: Add parsing for CEE DCBX TLVs

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

i40e_debugfs.c

i40e: use DECLARE_BITMAP for state fields

2017-04-30 04:48:13 -07:00

i40e_devids.h

i40e: Add support for 25G devices

2016-12-06 20:59:43 -08: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/i40evf: remove mismatched type warnings

2017-07-26 03:25:20 -07:00

i40e_fcoe.c

networking: make skb_put & friends return void pointers

2017-06-16 11:48:39 -04: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

net: sched: get rid of struct tc_to_netdev

2017-08-07 09:42:37 -07:00

i40e_nvm.c

i40e: Handle admin Q timeout when releasing NVM

2017-07-26 03:25:19 -07:00

i40e_osdep.h

i40e: Drop FCoE code from core driver files

2017-03-27 16:47:43 -07:00

i40e_prototype.h

virtchnl: rename i40e to generic virtchnl

2017-06-01 14:08:53 -07:00

i40e_ptp.c

i40e: fix up 32 bit timespec references

2017-07-26 03:25:19 -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_trace.h

i40e/i40evf: Add tracepoints

2017-04-19 16:47:31 -07:00

i40e_txrx.c

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

2017-08-09 16:28:45 -07:00

i40e_txrx.h

i40e: add support for XDP_TX action

2017-06-20 18:17:09 -07:00

i40e_type.h

i40e: new AQ commands

2017-04-19 17:04:06 -07:00

i40e_virtchnl_pf.c

i40e: handle setting administratively set MAC address back to zero

2017-07-26 03:25:21 -07:00

i40e_virtchnl_pf.h

virtchnl: convert to new macros

2017-06-01 14:15:21 -07:00

i40e.h

i40e: Add support for OEM firmware version

2017-06-20 18:17:11 -07:00

Makefile

i40e/i40evf: Add tracepoints

2017-04-19 16:47:31 -07:00