From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 23 Oct 2013 06:51:25 +0000 (+0100)
Subject: Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... 
X-Git-Tag: Ubuntu-5.2.0-15.16~14690
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=0d645a8b823b4de4b4644312df4deb2e61213091;p=mirror_ubuntu-eoan-kernel.git

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

Pull infiniband bugfix from Roland Dreier:
 "Disable not-quite-ready userspace ABI for IB flow steering"

* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/core: Temporarily disable create_flow/destroy_flow uverbs
---

0d645a8b823b4de4b4644312df4deb2e61213091