From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 7 Feb 2015 19:10:40 +0000 (-0800)
Subject: Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... 
X-Git-Tag: v4.14-rc1~6031
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0b1ce1a8ca14478bc6748c18434c523fb0ae8225;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'rdma-for-linus' of git://git./linux/kernel/git/roland/infiniband

Pull one more infiniband revert from Roland Dreier:
 "One more last-second RDMA change for 3.19: Yann realized that the
  previous revert of new userspace ABI did not go far enough, and we're
  still exposing a change that we don't want.  Revert even closer to
  3.18 interface to make sure we get things right in the long run"

Yann Droneaud pipes up:
 "I hope this could go in v3.19 as, at this stage, we don't want to
  expose any bits of this ABI in a released kernel"

* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  Revert "IB/core: Add support for extended query device caps"
---

0b1ce1a8ca14478bc6748c18434c523fb0ae8225