From 8db07e304f38e256c5a20a45f2acb3ab6a5926f3 Mon Sep 17 00:00:00 2001
From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Mon, 28 Jan 2013 10:44:48 +0000
Subject: [PATCH] --- yaml --- r: 352769 b: refs/heads/master c:
 d1beadd1cb649404bfa2c3d92f77dbcb15b712e5 h: refs/heads/master i:   352767:
 586b3a985979b1c91ded6a97c72d728d6a607b4b v: v3

---
 [refs]                                            | 2 +-
 trunk/include/uapi/linux/netfilter/xt_conntrack.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7276fe7ea365..c6462058e766 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35612a229c3a66aad7577d7f25e7ebb5286faf2d
+refs/heads/master: d1beadd1cb649404bfa2c3d92f77dbcb15b712e5
diff --git a/trunk/include/uapi/linux/netfilter/xt_conntrack.h b/trunk/include/uapi/linux/netfilter/xt_conntrack.h
index e3c041d54020..e5bd3083a843 100644
--- a/trunk/include/uapi/linux/netfilter/xt_conntrack.h
+++ b/trunk/include/uapi/linux/netfilter/xt_conntrack.h
@@ -31,6 +31,7 @@ enum {
 	XT_CONNTRACK_REPLSRC_PORT = 1 << 10,
 	XT_CONNTRACK_REPLDST_PORT = 1 << 11,
 	XT_CONNTRACK_DIRECTION    = 1 << 12,
+	XT_CONNTRACK_STATE_ALIAS  = 1 << 13,
 };
 
 struct xt_conntrack_mtinfo1 {