2013-10-22 17:22:38

by Roland Dreier

[permalink] [raw]
Subject: [GIT PULL] please pull infiniband.git

Hi Linus,

This is the "disable ABI we don't want to freeze" pull I warned you about.

Please pull from

git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git tags/rdma-for-linus

----------------------------------------------------------------
Disable not-quite-ready userspace ABI for IB flow steering

----------------------------------------------------------------
Yann Droneaud (1):
IB/core: Temporarily disable create_flow/destroy_flow uverbs

drivers/infiniband/Kconfig | 11 +++++++++++
drivers/infiniband/core/uverbs.h | 2 ++
drivers/infiniband/core/uverbs_cmd.c | 4 ++++
drivers/infiniband/core/uverbs_main.c | 6 ++++++
drivers/infiniband/hw/mlx4/main.c | 2 ++
include/uapi/rdma/ib_user_verbs.h | 6 ++++++
6 files changed, 31 insertions(+)