]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge branch 'ovs-conntrack'
authorDavid S. Miller <davem@davemloft.net>
Thu, 27 Aug 2015 18:40:44 +0000 (11:40 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 27 Aug 2015 18:40:44 +0000 (11:40 -0700)
commit21c721fd0b991b1871ea5dd517be1b5375c5f8f7
tree11d4fe2287105c7009e4c1c27d5d722658d2374b
parent538e4563198cd3d1a8e74c47fee3e49dc93e4a95
parentcae3a2627520c3795b54533c5328b77af3405dbe
Merge branch 'ovs-conntrack'

Joe Stringer says:

====================
OVS conntrack support

The goal of this series is to allow OVS to send packets through the Linux
kernel connection tracker, and subsequently match on fields populated by
conntrack. This functionality is enabled through a new
CONFIG_OPENVSWITCH_CONNTRACK option.

This version addresses the feedback from v5, primarily checking the behaviour
is correct with different configurations such as disabling
CONFIG_OPENVSWITCH_CONNTRACK or disabling individual conntrack features like
connlabels.

The branch below has been updated with the corresponding userspace pieces:
https://github.com/joestringer/ovs dev/ct_20150818
====================

Signed-off-by: David S. Miller <davem@davemloft.net>