From: Linus Torvalds Date: Tue, 27 Nov 2007 22:20:51 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... X-Git-Tag: firefly_0821_release~24255 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=86e67a07d4dc8cd40454698f2abb972fced06910;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-linus' of git://git./linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: IB/iser: Add missing counter increment in iser_data_buf_aligned_len() IB/ehca: Fix static rate regression mlx4_core: Fix state check in mlx4_qp_modify() IB/ipath: Normalize error return codes for posting work requests IB/ipath: Fix offset returned to ibv_modify_srq() IB/ipath: Fix error path in QP creation IB/ipath: Fix offset returned to ibv_resize_cq() --- 86e67a07d4dc8cd40454698f2abb972fced06910