]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sat, 20 Jan 2018 03:59:33 +0000 (22:59 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sat, 20 Jan 2018 03:59:33 +0000 (22:59 -0500)
commit8565d26bcb2ff6df646e946d2913fcf706d46b66
tree21ffaccc3cbac5e558d51c20cfbecbfec86a02c4
parent85831e56a1d0c75a1560e61acbb8591e9f11c6b7
parentec835f8104a21f4d4eeb9d316ee71d2b4a7f00de
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
arch/arm64/net/bpf_jit_comp.c
drivers/net/can/usb/peak_usb/pcan_usb_fd.c
drivers/net/ethernet/ibm/ibmvnic.c
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
drivers/net/tun.c
drivers/ssb/Kconfig
kernel/bpf/core.c
kernel/bpf/verifier.c
net/can/af_can.c
net/core/filter.c
net/core/flow_dissector.c
net/ipv6/ip6_fib.c
net/ipv6/ip6_gre.c
net/netlink/af_netlink.c
net/sched/cls_bpf.c
net/wireless/nl80211.c
tools/testing/selftests/bpf/test_verifier.c