asedeno.scripts.mit.edu Git - linux.git/commit

]> asedeno.scripts.mit.edu Git - linux.git/commit

author	David S. Miller <davem@davemloft.net>
	Thu, 2 Nov 2017 05:59:52 +0000 (14:59 +0900)
committer	David S. Miller <davem@davemloft.net>
	Thu, 2 Nov 2017 06:23:39 +0000 (15:23 +0900)
commit	ed29668d1aa2c6f01e61dd616df13b5241cee7e0
tree	a086cf6311ed8623b292d3ea8d73c03f53207be0	tree \| snapshot
parent	65c959a39b7e9ad6b443b74904486b4a75b0232f	commit \| diff
parent	3a99df9a3d14cd866b5516f8cba515a3bfd554ab	commit \| diff

Merge git://git.kernel.org/pub/scm/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	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns/hns_enet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/reg.h	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
include/net/tcp.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/bpf.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/sockmap.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/l2tp/l2tp_ppp.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_api.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_policy.c	diff1 \|	diff2 \|	blob \| history
tools/include/uapi/linux/bpf.h	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/tc-testing/tdc.py	diff1 \|	diff2 \|	blob \| history

local clone of linux.git

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns/hns_enet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/reg.h	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
include/net/tcp.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/bpf.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/sockmap.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/l2tp/l2tp_ppp.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_api.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_policy.c	diff1 \|	diff2 \|	blob \| history
tools/include/uapi/linux/bpf.h	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/tc-testing/tdc.py	diff1 \|	diff2 \|	blob \| history