[openib-general] svn checkin to merge upstream

[Sean Hefty]

>This one (below)?
>Seems to do more than it says, and I now get a warning about the "out:" label
>being unused. Is it just me?

I missed the warning because I extracted this patch from my CM event handling
patch, which reworked the error handling in this function.

>Further, wouldn't
>	if (IS_ERR()) {
>		ret = PTR_ERR(cm_id_priv->timewait_info);
>		goto out;
>	}
>
>be more elegant, and a smaller patch?

It would, but it's possible the CM event patch would just change it again
anyway.  I will check on that, and at least fix the warning.

- Sean