diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-11 11:22:44 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-11 11:22:44 -0700 |
commit | ec0c96714e7ddeda4eccaa077f5646a0fd6e371f (patch) | |
tree | c365355d656bf1f5ca95875224bebe8c6dae49af /tools/testing/selftests/tc-testing/tc-tests/actions/connmark.json | |
parent | 4f7a7beaee77275671654f7b9f3f9e73ca16ec65 (diff) | |
parent | d472b3a6cf63cd31cae1ed61930f07e6cd6671b5 (diff) | |
download | talos-obmc-linux-ec0c96714e7ddeda4eccaa077f5646a0fd6e371f.tar.gz talos-obmc-linux-ec0c96714e7ddeda4eccaa077f5646a0fd6e371f.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking fixes from David Miller:
"Last bit of straggler fixes...
1) Fix btf library licensing to LGPL, from Martin KaFai lau.
2) Fix error handling in bpf sockmap code, from Daniel Borkmann.
3) XDP cpumap teardown handling wrt. execution contexts, from Jesper
Dangaard Brouer.
4) Fix loss of runtime PM on failed vlan add/del, from Ivan
Khoronzhuk.
5) xen-netfront caches skb_shinfo(skb) across a __pskb_pull_tail()
call, which potentially changes the skb's data buffer, and thus
skb_shinfo(). Fix from Juergen Gross"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
xen/netfront: don't cache skb_shinfo()
net: ethernet: ti: cpsw: fix runtime_pm while add/kill vlan
net: ethernet: ti: cpsw: clear all entries when delete vid
xdp: fix bug in devmap teardown code path
samples/bpf: xdp_redirect_cpu adjustment to reproduce teardown race easier
xdp: fix bug in cpumap teardown code path
bpf, sockmap: fix cork timeout for select due to epipe
bpf, sockmap: fix leak in bpf_tcp_sendmsg wait for mem path
bpf, sockmap: fix bpf_tcp_sendmsg sock error handling
bpf: btf: Change tools/lib/bpf/btf to LGPL
Diffstat (limited to 'tools/testing/selftests/tc-testing/tc-tests/actions/connmark.json')
0 files changed, 0 insertions, 0 deletions