diff --git a/[refs] b/[refs]
index dc0f04348413..6d8ff545c0c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b29043921ef021443c5e0d055b7b8dd5df88258
+refs/heads/master: edba846af9e1f27bab00d5aebfeef01386e00af0
diff --git a/trunk/drivers/infiniband/hw/cxgb3/iwch.h b/trunk/drivers/infiniband/hw/cxgb3/iwch.h
index caf4e6007a44..9ad9b1e7c8c1 100644
--- a/trunk/drivers/infiniband/hw/cxgb3/iwch.h
+++ b/trunk/drivers/infiniband/hw/cxgb3/iwch.h
@@ -147,7 +147,7 @@ static inline int insert_handle(struct iwch_dev *rhp, struct idr *idr,
 				void *handle, u32 id)
 {
 	int ret;
-	u32 newid;
+	int newid;
 
 	do {
 		if (!idr_pre_get(idr, GFP_KERNEL)) {