leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a0cccce2ce
linux/drivers/net/ethernet/broadcom/bnx2x
History
David S. Miller 54e5c4def0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/bonding/bond_alb.c
	drivers/net/ethernet/altera/altera_msgdma.c
	drivers/net/ethernet/altera/altera_sgdma.c
	net/ipv6/xfrm6_output.c

Several cases of overlapping changes.

The xfrm6_output.c has a bug fix which overlaps the renaming
of skb->local_df to skb->ignore_df.

In the Altera TSE driver cases, the register access cleanups
in net-next overlapped with bug fixes done in net.

Similarly a bug fix to send ALB packets in the bonding driver using
the right source address overlaps with cleanups in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-05-24 00:32:30 -04:00
..
bnx2x_cmn.c bnx2x: Support mng. request for driver version 2014-03-25 21:07:03 -04:00
bnx2x_cmn.h net: bnx2x: include irq.h for irqreturn_t definitions 2014-04-03 14:04:32 -04:00
bnx2x_dcb.c bnx2x: (semantic) revise scheduling of sp_rtnl 2014-02-12 19:15:42 -05:00
bnx2x_dcb.h bnx2x: Change DCB context handling 2013-08-20 00:21:47 -07:00
bnx2x_dump.h bnx2x: Revise comments and alignment 2013-06-02 21:36:47 -07:00
bnx2x_ethtool.c net: get rid of SET_ETHTOOL_OPS 2014-05-13 17:43:20 -04:00
bnx2x_fw_defs.h bnx2x: Remove unnecessary internal mem config 2014-02-12 19:15:41 -05:00
bnx2x_fw_file_hdr.h
bnx2x_hsi.h bnx2x: Support mng. request for driver version 2014-03-25 21:07:03 -04:00
bnx2x_init_ops.h bnx2x: Remove many sparse warnings 2013-01-23 13:58:29 -05:00
bnx2x_init.h bnx2x: Don't pretend during register dump 2013-10-21 18:31:36 -04:00
bnx2x_link.c bnx2x: fix sparse warning 2014-01-15 15:06:47 -08:00
bnx2x_link.h bnx2x: namespace and dead code cleanups 2014-01-13 11:59:47 -08:00
bnx2x_main.c bnx2x: Fix UNDI driver unload 2014-05-09 16:01:46 -04:00
bnx2x_mfw_req.h
bnx2x_reg.h Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-01-06 17:37:45 -05:00
bnx2x_sp.c bnx2x: Revise IOV vlan/mac validation 2014-02-12 19:15:42 -05:00
bnx2x_sp.h bnx2x: Revise IOV vlan/mac validation 2014-02-12 19:15:42 -05:00
bnx2x_sriov.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-05-24 00:32:30 -04:00
bnx2x_sriov.h bnx2x: fix build when BNX2X_SRIOV is not enabled 2014-05-13 13:08:29 -04:00
bnx2x_stats.c bnx2x: Lock DMAE when used by statistic flow 2013-10-21 18:31:35 -04:00
bnx2x_stats.h bnx2x: Fix VF stats sync 2013-08-27 22:03:04 -04:00
bnx2x_vfpf.c bnx2x: Convert return 0 to return rc 2014-05-18 20:51:03 -04:00
bnx2x_vfpf.h bnx2x: Add support in PF driver for RSC 2014-02-12 19:15:41 -05:00
bnx2x.h bnx2x: Remove the sriov VFOP mechanism 2014-03-25 21:07:04 -04:00
Makefile