From: David S. Miller Date: Thu, 27 Aug 2015 18:40:44 +0000 (-0700) Subject: Merge branch 'ovs-conntrack' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=21c721fd0b991b1871ea5dd517be1b5375c5f8f7;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git 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 --- 21c721fd0b991b1871ea5dd517be1b5375c5f8f7