Merge branch 'xrc' into for-next

diff --cc drivers/infiniband/core/cma.c
Simple merge

diff --cc drivers/infiniband/core/ucma.c
Simple merge

diff --cc drivers/infiniband/core/uverbs_main.c
Simple merge

diff --cc drivers/infiniband/core/verbs.c
Simple merge

diff --cc include/rdma/ib_verbs.h
Simple merge