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

Conflicts:
	drivers/net/geneve.c

Here we had an overlapping change, where in 'net' the extraneous stats
bump was being removed whilst in 'net-next' the final argument to
udp_tunnel6_xmit_skb() was being changed.

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

2015-12-17 22:08:28 -05:00

..

i40e_adminq_cmd.h

i40e: Opcode and structures required by OEM Post Update AQ command and add new NVM arq message

2015-12-12 21:08:31 -08:00

i40e_adminq.c

i40e/i40evf: avoid mutex re-init

2015-12-03 13:43:06 -08:00

i40e_adminq.h

i40e/i40evf: fix a potential type compare issue

2015-10-07 13:38:11 -07:00

i40e_alloc.h

i40e: Fix GPL header

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

i40e_common.c

i40e: re-use %*ph specifier to hexdump a data

2015-10-23 05:22:13 -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: Convert CEE App TLV selector to IEEE selector

2015-10-13 23:27:37 -07:00

i40e_dcb.h

i40e: Add parsing for CEE DCBX TLVs

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

i40e_debugfs.c

i40e: remove unused argument

2015-12-01 22:59:05 -08:00

i40e_devids.h

i40e/i40evf: split device ids into a separate file

2015-10-13 23:37:13 -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 priv flags to control packet split

2015-12-03 02:23:35 -08:00

i40e_fcoe.c

i40e: remove BUG_ON from FCoE setup

2015-11-25 10:05:55 -08: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

2015-12-17 22:08:28 -05:00

i40e_nvm.c

i40e: fix unconditional execution of cpu_to_le16()

2015-10-23 05:40:49 -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/i40evf: Add a workaround to drop all flow control frames

2015-10-23 04:17:55 -07:00

i40e_ptp.c

i40e: generate fewer startup messages

2015-10-16 04:36:13 -07:00

i40e_register.h

i40e/i40evf: add VIRTCHNL_VF_OFFLOAD flag

2015-08-26 15:09:54 -07:00

i40e_status.h

i40e: Fix GPL header

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

i40e_txrx.c

i40e: geneve tunnel offload support

2015-12-16 10:58:56 -05:00

i40e_txrx.h

i40e: geneve tunnel offload support

2015-12-16 10:58:56 -05:00

i40e_type.h

i40e/i40evf: Fix an accidental error with BIT_ULL replacement

2015-10-19 15:35:45 -07:00

i40e_virtchnl_pf.c

i40e: don't add zero MAC filter

2015-12-12 21:08:15 -08:00

i40e_virtchnl_pf.h

i40e: reset the invalid msg counter in vf when a valid msg is received

2015-10-16 04:53:04 -07:00

i40e_virtchnl.h

i40e/i40evf: Add a new offload for RSS PCTYPE V2 for X722

2015-12-12 21:08:42 -08:00

i40e.h

i40e: geneve tunnel offload support

2015-12-16 10:58:56 -05:00

Makefile

i40e: Strip configfs code

2015-03-07 07:01:06 -08:00