diff --git a/[refs] b/[refs]
index d92bb6350699..adeab0a0b34f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b61fafc4ef3faf54236d57e3b230ca19167663bf
+refs/heads/master: 4bf07ef3fd5db2df7d1899fcf9c67d2263ead2e2
diff --git a/trunk/include/linux/xfrm.h b/trunk/include/linux/xfrm.h
index b54a12940ef6..6b42cc474c01 100644
--- a/trunk/include/linux/xfrm.h
+++ b/trunk/include/linux/xfrm.h
@@ -259,8 +259,8 @@ struct xfrm_usersa_id {
 };
 
 struct xfrm_aevent_id {
-	__u32				flags;
 	struct xfrm_usersa_id		sa_id;
+	__u32				flags;
 };
 
 struct xfrm_userspi_info {