diff --git a/[refs] b/[refs]
index 776e876a5d69..d1eb9169248f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b42835dbe83d725198c7ab0bbe726d6dfd92a634
+refs/heads/master: 7f6daa635c28ed686835a4080269e3fdc5a01012
diff --git a/trunk/net/key/af_key.c b/trunk/net/key/af_key.c
index 7fb54577f5bd..7db86ffcf070 100644
--- a/trunk/net/key/af_key.c
+++ b/trunk/net/key/af_key.c
@@ -2560,7 +2560,7 @@ static int pfkey_migrate(struct sock *sk, struct sk_buff *skb,
 }
 #else
 static int pfkey_migrate(struct sock *sk, struct sk_buff *skb,
-			 struct sadb_msg *hdr, void **ext_hdrs)
+			 const struct sadb_msg *hdr, void * const *ext_hdrs)
 {
 	return -ENOPROTOOPT;
 }