diff --git a/[refs] b/[refs]
index 752b60d18016..5081d77e0a26 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56b192c337ddad05dee83c9bea079f41df775990
+refs/heads/master: 8e1515df578e4665b77d1e0eec3c8b041d159b23
diff --git a/trunk/include/linux/netfilter/xt_conntrack.h b/trunk/include/linux/netfilter/xt_conntrack.h
index 34f63cf2e293..4c2d9945ca54 100644
--- a/trunk/include/linux/netfilter/xt_conntrack.h
+++ b/trunk/include/linux/netfilter/xt_conntrack.h
@@ -42,7 +42,7 @@ struct ip_conntrack_old_tuple
 		} u;
 
 		/* The protocol. */
-		u16 protonum;
+		__u16 protonum;
 	} dst;
 };