korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-23 19:14:30 +08:00
Code Issues Packages Projects Releases Wiki Activity
25c089d78f
linux/drivers/net/ethernet/intel/i40e
History
David S. Miller ba3e2084f2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	net/ipv6/xfrm6_output.c
	net/openvswitch/flow_netlink.c
	net/openvswitch/vport-gre.c
	net/openvswitch/vport-vxlan.c
	net/openvswitch/vport.c
	net/openvswitch/vport.h

The openvswitch conflicts were overlapping changes.  One was
the egress tunnel info fix in 'net' and the other was the
vport ->send() op simplification in 'net-next'.

The xfrm6_output.c conflicts was also a simplification
overlapping a bug fix.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-24 06:54:12 -07:00
..
i40e_adminq_cmd.h i40e: Add support for non-willing Apps 2015-10-16 04:48:11 -07:00
i40e_adminq.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-10-20 06:08:27 -07: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: fix a bug in debugfs with add/del macaddr 2015-10-23 04:22:49 -07: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 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-10-24 06:54:12 -07:00
i40e_fcoe.c i40e: Lock for VSI's MAC filter list 2015-10-19 15:15:08 -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/i40evf: clean up some code 2015-10-08 16:19:55 -07: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-10-24 06:54:12 -07:00
i40e_nvm.c i40e: fix unconditional execution of cpu_to_le16() 2015-10-23 05:40:49 -07:00
i40e_osdep.h i40e: adds FCoE configure option 2015-01-14 16:48:39 -05: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: add missing kernel-doc argument 2015-10-23 05:28:58 -07:00
i40e_txrx.h i40e/i40evf: adjust interrupt throttle less frequently 2015-10-19 15:35:12 -07: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: Disable VEB bridge mode with SR-IOV failure 2015-10-23 04:51:51 -07: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 WB_ON_ITR offload support 2015-10-15 02:03:29 -07:00
i40e.h i40e: Fix an incorrect OEM version string 2015-10-23 04:38:35 -07:00
Makefile i40e: Strip configfs code 2015-03-07 07:01:06 -08:00