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

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

author	David S. Miller <davem@davemloft.net>
	Thu, 2 Aug 2018 17:55:32 +0000 (10:55 -0700)
committer	David S. Miller <davem@davemloft.net>
	Thu, 2 Aug 2018 17:55:32 +0000 (10:55 -0700)
commit	d1cc427d99ee72dd5f9f171845f64c9d20a386b6
tree	dd9dcb1965baae8edcf0b496aaa6a70609b6fc11	tree \| snapshot
parent	da9b9318935258b2f2eb30b33afd1af08057c98d	commit \| diff
parent	3636a4ad21e00181fced9f21e21857e08cb69b1f	commit \| diff

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

The BTF conflicts were simple overlapping changes.

The virtio_net conflict was an overlap of a fix of statistics counter,
happening alongisde a move over to a bonafide statistics structure
rather than counting value on the stack.

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

31 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/block/nbd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/mv88e6xxx/chip.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/lan78xx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/xen-netfront.c	diff1 \|	diff2 \|	blob \| history
ipc/sem.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/core/xdp.c	diff1 \|	diff2 \|	blob \| history
net/dsa/slave.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/igmp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/inet_fragment.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_bbr.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/netlink/af_netlink.c	diff1 \|	diff2 \|	blob \| history
net/rds/ib_mr.h	diff1 \|	diff2 \|	blob \| history
net/rds/ib_rdma.c	diff1 \|	diff2 \|	blob \| history
net/rds/rdma.c	diff1 \|	diff2 \|	blob \| history
net/rds/rds.h	diff1 \|	diff2 \|	blob \| history
net/rds/send.c	diff1 \|	diff2 \|	blob \| history
net/socket.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_policy.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_user.c	diff1 \|	diff2 \|	blob \| history
tools/lib/bpf/btf.c	diff1 \|	diff2 \|	blob \| history
tools/lib/bpf/btf.h	diff1 \|	diff2 \|	blob \| history
tools/lib/bpf/libbpf.c	diff1 \|	diff2 \|	blob \| history
tools/lib/bpf/libbpf.h	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/block/nbd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/mv88e6xxx/chip.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/lan78xx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/xen-netfront.c	diff1 \|	diff2 \|	blob \| history
ipc/sem.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/core/xdp.c	diff1 \|	diff2 \|	blob \| history
net/dsa/slave.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/igmp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/inet_fragment.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_bbr.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/netlink/af_netlink.c	diff1 \|	diff2 \|	blob \| history
net/rds/ib_mr.h	diff1 \|	diff2 \|	blob \| history
net/rds/ib_rdma.c	diff1 \|	diff2 \|	blob \| history
net/rds/rdma.c	diff1 \|	diff2 \|	blob \| history
net/rds/rds.h	diff1 \|	diff2 \|	blob \| history
net/rds/send.c	diff1 \|	diff2 \|	blob \| history
net/socket.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_policy.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_user.c	diff1 \|	diff2 \|	blob \| history
tools/lib/bpf/btf.c	diff1 \|	diff2 \|	blob \| history
tools/lib/bpf/btf.h	diff1 \|	diff2 \|	blob \| history
tools/lib/bpf/libbpf.c	diff1 \|	diff2 \|	blob \| history
tools/lib/bpf/libbpf.h	diff1 \|	diff2 \|	blob \| history