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

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

author	David S. Miller <davem@davemloft.net>
	Sat, 20 Jan 2018 03:59:33 +0000 (22:59 -0500)
committer	David S. Miller <davem@davemloft.net>
	Sat, 20 Jan 2018 03:59:33 +0000 (22:59 -0500)
commit	4536d8dd3e06d1c425fc9278d17e0e1ce6e2370c
tree	21ffaccc3cbac5e558d51c20cfbecbfec86a02c4	tree \| snapshot
parent	97717337744a397b13e614d51b59c1f12ea0ff12	commit \| diff
parent	c2c16020320489230213f6cc6d8ca09e47e48d7a	commit \| diff

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

The BPF verifier conflict was some minor contextual issue.

The TUN conflict was less trivial. Cong Wang fixed a memory leak of
tfile->tx_array in 'net'. This is an skb_array. But meanwhile in
net-next tun changed tfile->tx_arry into tfile->tx_ring which is a
ptr_ring.

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

18 files changed:

arch/arm/net/bpf_jit_32.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/net/bpf_jit_comp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/usb/peak_usb/pcan_usb_fd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ibmvnic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/ssb/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/bpf/core.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
net/can/af_can.c	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/core/flow_dissector.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_fib.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_gre.c	diff1 \|	diff2 \|	blob \| history
net/netlink/af_netlink.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_bpf.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/test_verifier.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

arch/arm/net/bpf_jit_32.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/net/bpf_jit_comp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/usb/peak_usb/pcan_usb_fd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ibmvnic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/ssb/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/bpf/core.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
net/can/af_can.c	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/core/flow_dissector.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_fib.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_gre.c	diff1 \|	diff2 \|	blob \| history
net/netlink/af_netlink.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_bpf.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/test_verifier.c	diff1 \|	diff2 \|	blob \| history