mirror_ubuntu-kernels/drivers/net/ethernet/qlogic
David S. Miller a655fe9f19 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
An ipvlan bug fix in 'net' conflicted with the abstraction away
of the IPV6 specific support in 'net-next'.

Similarly, a bug fix for mlx5 in 'net' conflicted with the flow
action conversion in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>
2019-02-08 15:00:17 -08:00
..
netxen net: netxen: fix a missing check and an uninitialized use 2018-12-21 09:01:47 -08:00
qed Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2019-02-08 15:00:17 -08:00
qede Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2019-02-08 15:00:17 -08:00
qlcnic net: Add extack argument to ndo_fdb_add() 2019-01-17 15:18:47 -08:00
qlge qlge: Fix netdev features configuration. 2018-08-25 17:37:38 -07:00
Kconfig qed*: Utilize FW 8.33.1.0 2018-01-02 13:59:16 -05:00
Makefile License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
qla3xxx.c net: qla3xxx: Remove overflowing shift statement 2018-10-17 21:52:40 -07:00
qla3xxx.h