merge Linus head tree into my drm tree and fix up conflicts

1 files changed, 1 insertions, 1 deletions

diff --git a/net/dccp/ackvec.c b/net/dccp/ackvec.c
index 6530283eafca..c9a62cca22fc 100644
--- a/net/dccp/ackvec.c
+++ b/net/dccp/ackvec.c
@@ -91,7 +91,7 @@ int dccp_insert_option_ackvec(struct sock *sk, struct sk_buff *skb)
 }
 
 struct dccp_ackvec *dccp_ackvec_alloc(const unsigned int len,
-                                      const unsigned int __nocast priority)
+                                      const gfp_t priority)
 {
         struct dccp_ackvec *av = kmalloc(sizeof(*av) + len, priority);