git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.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	b289f125059aba145d2ec7456d7f90e98f24e328
tree	87302af9e03ee50cf135cc9ce6589f41fe3b3db1	tree \| snapshot
parent	eca1710500c9a949534522a2f1255a26cce140d4	commit \| diff
parent	907d9d623bc71b5da2c4e1c6736ed45822069520	commit \| diff

Merge git://git.kernel.org/pub/scm/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

Linux Kernel Source 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