Failed in applying to current master (
apply log)
Makefile.target | 4 ++--
configure | 16 ++++++-------
hw/rdma/rdma_backend.c | 51 +++++++++++++++++++++++++----------------
hw/rdma/rdma_backend.h | 6 +++--
hw/rdma/rdma_backend_defs.h | 2 +-
hw/rdma/rdma_rm.c | 38 +++++++++++++++++++++++--------
hw/rdma/rdma_rm.h | 5 +++-
hw/rdma/rdma_rm_defs.h | 2 +-
hw/rdma/rdma_utils.c | 6 ++---
hw/rdma/rdma_utils.h | 6 ++---
hw/rdma/vmw/pvrdma.h | 8 +++----
hw/rdma/vmw/pvrdma_cmd.c | 45 +++++++++++++++++++++++++++---------
hw/rdma/vmw/pvrdma_dev_ring.c | 14 ++++++------
hw/rdma/vmw/pvrdma_dev_ring.h | 4 ++--
hw/rdma/vmw/pvrdma_main.c | 53 ++++++++++++++++++++++---------------------
hw/rdma/vmw/pvrdma_qp_ops.c | 10 ++++----
rules.mak | 2 +-
17 files changed, 166 insertions(+), 106 deletions(-)