Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 2 Nov 2017 05:59:52 +0000 (14:59 +0900)
committerDavid S. Miller <davem@davemloft.net>
Thu, 2 Nov 2017 06:23:39 +0000 (15:23 +0900)
commited29668d1aa2c6f01e61dd616df13b5241cee7e0
treea086cf6311ed8623b292d3ea8d73c03f53207be0
parent65c959a39b7e9ad6b443b74904486b4a75b0232f
parent3a99df9a3d14cd866b5516f8cba515a3bfd554ab
Merge git://git./linux/kernel/git/davem/net

Smooth Cong Wang's bug fix into 'net-next'.  Basically put
the bulk of the tcf_block_put() logic from 'net' into
tcf_block_put_ext(), but after the offload unbind.

Signed-off-by: David S. Miller <davem@davemloft.net>
14 files changed:
MAINTAINERS
drivers/net/ethernet/hisilicon/hns/hns_enet.c
drivers/net/ethernet/mellanox/mlxsw/reg.h
drivers/net/tun.c
include/net/tcp.h
include/uapi/linux/bpf.h
kernel/bpf/sockmap.c
net/ipv4/tcp_output.c
net/ipv6/addrconf.c
net/l2tp/l2tp_ppp.c
net/sched/cls_api.c
net/xfrm/xfrm_policy.c
tools/include/uapi/linux/bpf.h
tools/testing/selftests/tc-testing/tdc.py