git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

author	David S. Miller <davem@davemloft.net>
	Wed, 6 Jul 2016 17:35:22 +0000 (10:35 -0700)
committer	David S. Miller <davem@davemloft.net>
	Wed, 6 Jul 2016 17:35:22 +0000 (10:35 -0700)
commit	30d0844bdcea9fb8b0b3c8abfa5547bc3bcf8baa
tree	87302af9e03ee50cf135cc9ce6589f41fe3b3db1	tree \| snapshot
parent	ae3e4562e2ce0149a4424c994a282955700711e7	commit \| diff
parent	bc86765181aa26cc9afcb0a6f9f253cbb1186f26	commit \| diff

Merge git://git./linux/kernel/git/davem/net

Conflicts:
drivers/net/ethernet/mellanox/mlx5/core/en.h
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/usb/r8152.c

All three conflicts were overlapping changes.

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

19 files changed:

drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bcmsysport.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/e1000e/netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/geneve.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/r8152.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_l2_main.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_l3_main.c	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/driver.h	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_output.c	diff1 \|	diff2 \|	blob \| history
net/packet/af_packet.c	diff1 \|	diff2 \|	blob \| history
net/rds/tcp.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_mirred.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree

RSS Atom

drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bcmsysport.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/e1000e/netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/geneve.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/r8152.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_l2_main.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_l3_main.c	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/driver.h	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_output.c	diff1 \|	diff2 \|	blob \| history
net/packet/af_packet.c	diff1 \|	diff2 \|	blob \| history
net/rds/tcp.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_mirred.c	diff1 \|	diff2 \|	blob \| history