From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 27 May 2022 04:08:40 +0000 (-0700)
Subject: Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=780d8ce7162818cfe03e9a5e23b3af192a1d37bc;p=linux.git

Merge tag 'for-linus' of git://git./linux/kernel/git/rdma/rdma

Pull rdma updates from Jason Gunthorpe:
 "Small collection of incremental improvement patches:

   - Minor code cleanup patches, comment improvements, etc from static
     tools

   - Clean the some of the kernel caps, reducing the historical stealth
     uAPI leftovers

   - Bug fixes and minor changes for rdmavt, hns, rxe, irdma

   - Remove unimplemented cruft from rxe

   - Reorganize UMR QP code in mlx5 to avoid going through the IB verbs
     layer

   - flush_workqueue(system_unbound_wq) removal

   - Ensure rxe waits for objects to be unused before allowing the core
     to free them

   - Several rc quality bug fixes for hfi1"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: (67 commits)
  RDMA/rtrs-clt: Fix one kernel-doc comment
  RDMA/hfi1: Remove all traces of diagpkt support
  RDMA/hfi1: Consolidate software versions
  RDMA/hfi1: Remove pointless driver version
  RDMA/hfi1: Fix potential integer multiplication overflow errors
  RDMA/hfi1: Prevent panic when SDMA is disabled
  RDMA/hfi1: Prevent use of lock before it is initialized
  RDMA/rxe: Fix an error handling path in rxe_get_mcg()
  IB/core: Fix typo in comment
  RDMA/core: Fix typo in comment
  IB/hf1: Fix typo in comment
  IB/qib: Fix typo in comment
  IB/iser: Fix typo in comment
  RDMA/mlx4: Avoid flush_scheduled_work() usage
  IB/isert: Avoid flush_scheduled_work() usage
  RDMA/mlx5: Remove duplicate pointer assignment in mlx5_ib_alloc_implicit_mr()
  RDMA/qedr: Remove unnecessary synchronize_irq() before free_irq()
  RDMA/hns: Use hr_reg_read() instead of remaining roce_get_xxx()
  RDMA/hns: Use hr_reg_xxx() instead of remaining roce_set_xxx()
  RDMA/irdma: Add SW mechanism to generate completions on error
  ...
---

780d8ce7162818cfe03e9a5e23b3af192a1d37bc
diff --cc drivers/infiniband/ulp/isert/ib_isert.c
index 48064bd8aa2c6,b9e8afb51f6e2..b360a1527cd10
--- a/drivers/infiniband/ulp/isert/ib_isert.c
+++ b/drivers/infiniband/ulp/isert/ib_isert.c
@@@ -1017,11 -1018,11 +1018,11 @@@ isert_rx_login_req(struct isert_conn *i
  		complete(&isert_conn->login_comp);
  		return;
  	}
- 	schedule_delayed_work(&conn->login_work, 0);
+ 	queue_delayed_work(isert_login_wq, &conn->login_work, 0);
  }
  
 -static struct iscsi_cmd
 -*isert_allocate_cmd(struct iscsi_conn *conn, struct iser_rx_desc *rx_desc)
 +static struct iscsit_cmd
 +*isert_allocate_cmd(struct iscsit_conn *conn, struct iser_rx_desc *rx_desc)
  {
  	struct isert_conn *isert_conn = conn->context;
  	struct isert_cmd *isert_cmd;