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

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

author	David S. Miller <davem@davemloft.net>
	Wed, 15 Mar 2017 18:59:10 +0000 (11:59 -0700)
committer	David S. Miller <davem@davemloft.net>
	Wed, 15 Mar 2017 18:59:10 +0000 (11:59 -0700)
commit	30835e3887b1f586f42a9a864d60b8faa22aaa77
tree	06d8a02a4fd91acdd6c31340452e85feaac4ecb7	tree \| snapshot
parent	723f76dab311e8b2b50327b3f977b700be8b0743	commit \| diff
parent	3d867a4ea9c9024aaf7111be7032ba9111800cda	commit \| diff

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
drivers/net/ethernet/broadcom/genet/bcmgenet.c
net/core/sock.c

Conflicts were overlapping changes in bcmgenet and the
lockdep handling of sockets.

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

26 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/genet/bcmgenet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/genet/bcmgenet.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cavium/liquidio/lio_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cavium/liquidio/octeon_droq.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/reg.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_cxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_dev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_ll2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/hyperv/hyperv_net.h	diff1 \|	diff2 \|	blob \| history
drivers/net/hyperv/netvsc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/hyperv/netvsc_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vxlan.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qedf/qedf_io.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qedi/qedi_fw.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qedi/qedi_iscsi.c	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
net/core/sock.c	diff1 \|	diff2 \|	blob \| history
net/decnet/af_decnet.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/mpls/af_mpls.c	diff1 \|	diff2 \|	blob \| history
net/rds/ib_cm.c	diff1 \|	diff2 \|	blob \| history
net/sctp/socket.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/genet/bcmgenet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/genet/bcmgenet.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cavium/liquidio/lio_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cavium/liquidio/octeon_droq.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/reg.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_cxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_dev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_ll2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/hyperv/hyperv_net.h	diff1 \|	diff2 \|	blob \| history
drivers/net/hyperv/netvsc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/hyperv/netvsc_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vxlan.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qedf/qedf_io.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qedi/qedi_fw.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qedi/qedi_iscsi.c	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
net/core/sock.c	diff1 \|	diff2 \|	blob \| history
net/decnet/af_decnet.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/mpls/af_mpls.c	diff1 \|	diff2 \|	blob \| history
net/rds/ib_cm.c	diff1 \|	diff2 \|	blob \| history
net/sctp/socket.c	diff1 \|	diff2 \|	blob \| history