mirror_ubuntu-kernels/drivers/net/ethernet/intel/ixgbe
David S. Miller 0f3e9c97eb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All of the conflicts were cases of overlapping changes.

In net/core/devlink.c, we have to make care that the
resouce size_params have become a struct member rather
than a pointer to such an object.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-03-06 01:20:46 -05:00
..
ixgbe_82598.c ixgbe: Fix kernel-doc format warnings 2018-01-12 08:20:40 -08:00
ixgbe_82599.c ixgbe: Fix kernel-doc format warnings 2018-01-12 08:20:40 -08:00
ixgbe_common.c ixgbe: Fix && vs || typo 2018-01-26 10:25:32 -08:00
ixgbe_common.h ixgbe: extend firmware version support 2018-01-09 08:36:34 -08:00
ixgbe_dcb_82598.c ixgbe: Fix kernel-doc format warnings 2018-01-12 08:20:40 -08:00
ixgbe_dcb_82598.h
ixgbe_dcb_82599.c ixgbe: Fix kernel-doc format warnings 2018-01-12 08:20:40 -08:00
ixgbe_dcb_82599.h
ixgbe_dcb_nl.c ixgbe: Don't assume dev->num_tc is equal to hardware TC config 2018-01-12 08:20:15 -08:00
ixgbe_dcb.c ixgbe: Fix kernel-doc format warnings 2018-01-12 08:20:40 -08:00
ixgbe_dcb.h
ixgbe_debugfs.c ixgbe: Fix kernel-doc format warnings 2018-01-12 08:20:40 -08:00
ixgbe_ethtool.c ixgbe: Avoid to write the RETA table when unnecessary 2018-02-26 09:09:15 -08:00
ixgbe_fcoe.c ixgbe: Fix kernel-doc format warnings 2018-01-12 08:20:40 -08:00
ixgbe_fcoe.h ixgbe: adds x550 specific FCoE offloads 2015-04-10 00:15:55 -07:00
ixgbe_ipsec.c ixgbe: register ipsec offload with the xfrm subsystem 2018-01-23 10:09:12 -08:00
ixgbe_ipsec.h ixgbe: add ipsec data structures 2018-01-23 09:11:27 -08:00
ixgbe_lib.c ixgbe: remove redundant initialization of 'pool' 2018-02-26 08:28:14 -08:00
ixgbe_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2018-03-06 01:20:46 -05:00
ixgbe_mbx.c ixgbe: use BIT() macro 2016-04-25 04:15:11 -07:00
ixgbe_mbx.h ixgbe: Add PF support for VF promiscuous mode 2017-01-03 13:03:40 -08:00
ixgbe_model.h ixgbe: Fix deleting link filters for cls_u32 offloads 2016-06-29 10:05:24 -07:00
ixgbe_phy.c ixgbe: Fix kernel-doc format warnings 2018-01-12 08:20:40 -08:00
ixgbe_phy.h ixgbe: correct CS4223/7 PHY identification 2017-05-31 04:48:19 -07:00
ixgbe_ptp.c ixgbe: Fix kernel-doc format warnings 2018-01-12 08:20:40 -08:00
ixgbe_sriov.c ixgbe: Don't assume dev->num_tc is equal to hardware TC config 2018-01-12 08:20:15 -08:00
ixgbe_sriov.h ixgbe: do not use adapter->num_vfs when setting VFs via module parameter 2017-04-18 13:25:30 -07:00
ixgbe_sysfs.c
ixgbe_type.h ixgbe: process the Tx ipsec offload 2018-01-23 10:02:30 -08:00
ixgbe_x540.c ixgbe: Clear SWFW_SYNC register during init 2017-10-09 09:28:23 -07:00
ixgbe_x540.h ixgbe: Place SWFW semaphore in known valid state at probe 2016-04-04 17:44:50 -07:00
ixgbe_x550.c ixgbe: use ARRAY_SIZE for array sizing calculation on array buf 2018-01-26 10:25:19 -08:00
ixgbe.h ixgbe: ipsec offload stats 2018-01-23 10:07:18 -08:00
Makefile ixgbe: add ipsec register access routines 2018-01-23 09:00:18 -08:00