diff --git a/[refs] b/[refs]
index 961356247dc6..b31099d9c83e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4553eddae592b948c9695c9a0002169b0cab6fc
+refs/heads/master: 526bdb80a23b2e10ed4ccc3fcf309c9118d892d6
diff --git a/trunk/include/linux/xfrm.h b/trunk/include/linux/xfrm.h
index f0df02ae68a4..4d19b9e65317 100644
--- a/trunk/include/linux/xfrm.h
+++ b/trunk/include/linux/xfrm.h
@@ -140,8 +140,9 @@ enum {
 	XFRM_MSG_FLUSHPOLICY,
 #define XFRM_MSG_FLUSHPOLICY XFRM_MSG_FLUSHPOLICY
 
-	XFRM_MSG_MAX
+	__XFRM_MSG_MAX
 };
+#define XFRM_MSG_MAX (__XFRM_MSG_MAX - 1)
 
 struct xfrm_user_tmpl {
 	struct xfrm_id		id;