From: David S. Miller Date: Thu, 21 Nov 2019 19:44:06 +0000 (-0800) Subject: Merge branch 'net-sched-support-vxlan-and-erspan-options' X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ff998a80c359581dc5126897e953aa9ad3d65ae1;p=linux.git Merge branch 'net-sched-support-vxlan-and-erspan-options' Xin Long says: ==================== net: sched: support vxlan and erspan options This patchset is to add vxlan and erspan options support in cls_flower and act_tunnel_key. The form is pretty much like geneve_opts in: https://patchwork.ozlabs.org/patch/935272/ https://patchwork.ozlabs.org/patch/954564/ but only one option is allowed for vxlan and erspan. v1->v2: - see each patch changelog. ==================== Acked-by: Jakub Kicinski Signed-off-by: David S. Miller --- ff998a80c359581dc5126897e953aa9ad3d65ae1