summaryrefslogtreecommitdiffstats
path: root/include/trace
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-02-07 11:10:40 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-02-07 11:10:40 -0800
commit0b1ce1a8ca14478bc6748c18434c523fb0ae8225 (patch)
tree32cc28b7a773510df12cd5f3bb0c79dcf572eefe /include/trace
parentbdfeb5a10471530dc93098e7b7663628ec951407 (diff)
parent43c6116573ca0f9fc907e6b46861f2f142acb33b (diff)
downloadlinux-0b1ce1a8ca14478bc6748c18434c523fb0ae8225.tar.bz2
Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/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"
Diffstat (limited to 'include/trace')
0 files changed, 0 insertions, 0 deletions