git.osdn.net Git - uclinux-h8/linux.git/commit

(root) / uclinux-h8 / linux.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	8565d26bcb2ff6df646e946d2913fcf706d46b66
tree	21ffaccc3cbac5e558d51c20cfbecbfec86a02c4	tree \| snapshot
parent	85831e56a1d0c75a1560e61acbb8591e9f11c6b7	commit \| diff
parent	ec835f8104a21f4d4eeb9d316ee71d2b4a7f00de	commit \| diff

Merge git://git./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

RSS Atom

About OSDN

Find Software

Develop Software

Help

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