please pull infiniband.git
Linus, please pull from
master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
This tree is also available from kernel.org mirrors at:
git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
This will get a few one-line fixes: change a maintainer email address that is going away soon, fix a bug that would make the second port on some HCAs useless, and fix SRP the right way now that the root cause is fixed via James's tree.
(And just to counter James's suggestion that the SRP user base is comparable to voyager's: these SRP fixes are coming from a real production user, and that user is @ornl.gov, which means that SRP is actually being used to do something involving things like atomic bombs or sharks with laser beams)
Dave Dillow (1):
IB/srp: Release transport before removing host
Dotan Barak (1):
IB/mlx4: Fix value of pkey_index in QP1 completions
Sean Hefty (1):
MAINTAINERS: Update Sean Hefty's email address
MAINTAINERS | 2 +- drivers/infiniband/hw/mlx4/cq.c | 2 +- drivers/infiniband/ulp/srp/ib_srp.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
MAINTAINERS +1 -1
@@ -1919,7 +1919,7 @@ INFINIBAND SUBSYSTEM P: Roland Dreier M: [email protected] P: Sean Hefty -M: [email protected] +M: [email protected] P: Hal Rosenstock M: [email protected] L: [email protected]
drivers/infiniband/hw/mlx4/cq.c +1 -1
@@ -430,7 +430,7 @@ static int mlx4_ib_poll_one(struct mlx4_ib_cq *cq, wc->dlid_path_bits = (be32_to_cpu (cqe->g_mlpath_rqpn) >>24 ) &0x7f ; wc->wc_flags |=be32_to_cpu (cqe->g_mlpath_rqpn) &0x80000000 ?IB_WC_GRH :0 ; - wc->pkey_index =be32_to_cpu (cqe->immed_rss_invalid) >>16 ; + wc->pkey_index =be32_to_cpu (cqe->immed_rss_invalid) &0x7f ; }return 0 ;
drivers/infiniband/ulp/srp/ib_srp.c +1 -1
@@ -2053,8 +2053,8 @@ static void srp_remove_one(struct ib_device *device)list_for_each_entry_safe (target, tmp_target, &host->target_list, list) { -scsi_remove_host (target->scsi_host);srp_remove_host (target->scsi_host); +scsi_remove_host (target->scsi_host);srp_disconnect_target (target);ib_destroy_cm_id (target->cm_id);srp_free_target_ib (target);