projects / linux / .git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 92425c4 d37e3bb)
Merge branch 'ipv6-add-ip6erspan-collect_md-mode'
authorDavid S. Miller <davem@davemloft.net>
Wed, 6 Dec 2017 19:45:29 +0000 (14:45 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 6 Dec 2017 19:45:29 +0000 (14:45 -0500)
commit3a9ab393287b64c96eee94001d0efed2a66f0be9
tree334d978fd0c89f585b2e604ffe92ea06317e9b34tree | snapshot
parent92425c40676d498efccae6fecdb8f8e4dcf7e4a4commit | diff
parentd37e3bb774ee922a7b5b8c26d798d1575b225858commit | diff
Merge branch 'ipv6-add-ip6erspan-collect_md-mode'

William Tu says:

====================
ipv6: add ip6erspan collect_md mode

Similar to erspan collect_md mode in ipv4, the first patch adds
support for ip6erspan collect metadata mode.  The second patch
adds the test case using bpf_skb_[gs]et_tunnel_key helpers.

The corresponding iproute2 patch:
https://marc.info/?l=linux-netdev&m=151251545410047&w=2
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
https://github.com/torvalds/linux.git