diff --git a/[refs] b/[refs]
index 3a474e4af295..aa22250625ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b36ae07cb7757bd3eabd13c79844083dccac2f77
+refs/heads/master: 28e5554df63085be3b8bd2aee6ddbc479f0d136e
diff --git a/trunk/drivers/scsi/scsi_transport_iscsi.c b/trunk/drivers/scsi/scsi_transport_iscsi.c
index 7fb69183c72d..55860d26f999 100644
--- a/trunk/drivers/scsi/scsi_transport_iscsi.c
+++ b/trunk/drivers/scsi/scsi_transport_iscsi.c
@@ -489,7 +489,7 @@ static inline struct list_head *skb_to_lh(struct sk_buff *skb)
 }
 
 static void*
-mempool_zone_alloc_skb(unsigned int gfp_mask, void *pool_data)
+mempool_zone_alloc_skb(gfp_t gfp_mask, void *pool_data)
 {
 	struct mempool_zone *zone = pool_data;