From: Linus Torvalds Date: Wed, 11 Apr 2012 20:24:52 +0000 (-0700) Subject: Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f549e088b806f44b6ab6eeef0cb71ced1d2488dd;p=~shefty%2Frdma-dev.git Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband Pull infiniband fixes from Roland Dreier: "Fix a regression in the /sys/class/infiniband/.../rate attribute -- old kernels used to just return something, even if the underlying value was out-of-bounds, while 3.4-rc1 returned EINVAL to userspace. This breaks some applications that check for the error, so go back to the old behavior." * tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: IB/core: Don't return EINVAL from sysfs rate attribute for invalid speeds IB/mlx4: Don't return an invalid speed when a port is down --- f549e088b806f44b6ab6eeef0cb71ced1d2488dd