IB: refresh context for trivial comment change

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

1 files changed, 10 insertions, 10 deletions

diff --git a/queue/IB-hfi1-Prevent-kernel-QP-post-send-hard-lockups.patch b/queue/IB-hfi1-Prevent-kernel-QP-post-send-hard-lockups.patch
index fa342e5..5950c33 100644
--- a/queue/IB-hfi1-Prevent-kernel-QP-post-send-hard-lockups.patch
+++ b/queue/IB-hfi1-Prevent-kernel-QP-post-send-hard-lockups.patch
@@ -1,4 +1,4 @@
-From b6eac931b9bb2bce4db7032c35b41e5e34ec22a5 Mon Sep 17 00:00:00 2001
+From 30eb329c8f25953abf0eab402c73f994cb1b9f64 Mon Sep 17 00:00:00 2001
 From: Mike Marciniszyn <mike.marciniszyn@intel.com>
 Date: Sun, 9 Apr 2017 10:16:35 -0700
 Subject: [PATCH] IB/hfi1: Prevent kernel QP post send hard lockups
@@ -26,7 +26,7 @@ Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
 Signed-off-by: Doug Ledford <dledford@redhat.com>
 
 diff --git a/drivers/infiniband/hw/hfi1/ruc.c b/drivers/infiniband/hw/hfi1/ruc.c
-index 879eb9b31954..ccf8d8037355 100644
+index 48d5094f98e2..e3060dc1d30e 100644
 --- a/drivers/infiniband/hw/hfi1/ruc.c
 +++ b/drivers/infiniband/hw/hfi1/ruc.c
 @@ -1,5 +1,5 @@
@@ -36,7 +36,7 @@ index 879eb9b31954..ccf8d8037355 100644
   *
   * This file is provided under a dual BSD/GPLv2 license.  When using or
   * redistributing this file, you may do so under either license.
-@@ -784,23 +784,29 @@ void hfi1_make_ruc_header(struct rvt_qp *qp, struct ib_other_headers *ohdr,
+@@ -833,23 +833,29 @@ void hfi1_make_ruc_header(struct rvt_qp *qp, struct hfi1_other_headers *ohdr,
  /* when sending, force a reschedule every one of these periods */
  #define SEND_RESCHED_TIMEOUT (5 * HZ)  /* 5s in jiffies */
  
@@ -60,7 +60,7 @@ index 879eb9b31954..ccf8d8037355 100644
 + * @in_thread: true if in a workqueue thread
   *
   * Process entries in the send work queue until credit or queue is
-  * exhausted.  Only allow one CPU to send a packet per QP.
+  * exhausted.  Only allow one CPU to send a packet per QP (tasklet).
   * Otherwise, two threads could send packets out of order.
   */
 -void hfi1_do_send(struct rvt_qp *qp)
@@ -68,7 +68,7 @@ index 879eb9b31954..ccf8d8037355 100644
  {
  	struct hfi1_pkt_state ps;
  	struct hfi1_qp_priv *priv = qp->priv;
-@@ -868,8 +874,10 @@ void hfi1_do_send(struct rvt_qp *qp)
+@@ -917,8 +923,10 @@ void hfi1_do_send(struct rvt_qp *qp)
  			qp->s_hdrwords = 0;
  			/* allow other tasks to run */
  			if (unlikely(time_after(jiffies, timeout))) {
@@ -81,7 +81,7 @@ index 879eb9b31954..ccf8d8037355 100644
  					spin_lock_irqsave(
  						&qp->s_lock,
  						ps.flags);
-@@ -882,11 +890,9 @@ void hfi1_do_send(struct rvt_qp *qp)
+@@ -931,11 +939,9 @@ void hfi1_do_send(struct rvt_qp *qp)
  						*ps.ppd->dd->send_schedule);
  					return;
  				}
@@ -97,7 +97,7 @@ index 879eb9b31954..ccf8d8037355 100644
  			}
  			spin_lock_irqsave(&qp->s_lock, ps.flags);
 diff --git a/drivers/infiniband/hw/hfi1/verbs.c b/drivers/infiniband/hw/hfi1/verbs.c
-index 57036e545bdb..7174a18ebaac 100644
+index 2b359540901d..bc0b962e976f 100644
 --- a/drivers/infiniband/hw/hfi1/verbs.c
 +++ b/drivers/infiniband/hw/hfi1/verbs.c
 @@ -1,5 +1,5 @@
@@ -107,7 +107,7 @@ index 57036e545bdb..7174a18ebaac 100644
   *
   * This file is provided under a dual BSD/GPLv2 license.  When using or
   * redistributing this file, you may do so under either license.
-@@ -1820,7 +1820,7 @@ int hfi1_register_ib_device(struct hfi1_devdata *dd)
+@@ -1678,7 +1678,7 @@ int hfi1_register_ib_device(struct hfi1_devdata *dd)
  	dd->verbs_dev.rdi.driver_f.qp_priv_free = qp_priv_free;
  	dd->verbs_dev.rdi.driver_f.free_all_qps = free_all_qps;
  	dd->verbs_dev.rdi.driver_f.notify_qp_reset = notify_qp_reset;
@@ -117,7 +117,7 @@ index 57036e545bdb..7174a18ebaac 100644
  	dd->verbs_dev.rdi.driver_f.schedule_send_no_lock = _hfi1_schedule_send;
  	dd->verbs_dev.rdi.driver_f.get_pmtu_from_attr = get_pmtu_from_attr;
 diff --git a/drivers/infiniband/hw/hfi1/verbs.h b/drivers/infiniband/hw/hfi1/verbs.h
-index 6c549e7a25e7..46b00ed9f2dc 100644
+index d1b101c54828..a1d56e33cc87 100644
 --- a/drivers/infiniband/hw/hfi1/verbs.h
 +++ b/drivers/infiniband/hw/hfi1/verbs.h
 @@ -1,5 +1,5 @@
@@ -127,7 +127,7 @@ index 6c549e7a25e7..46b00ed9f2dc 100644
   *
   * This file is provided under a dual BSD/GPLv2 license.  When using or
   * redistributing this file, you may do so under either license.
-@@ -355,7 +355,9 @@ void hfi1_make_ruc_header(struct rvt_qp *qp, struct ib_other_headers *ohdr,
+@@ -445,7 +445,9 @@ void hfi1_make_ruc_header(struct rvt_qp *qp, struct hfi1_other_headers *ohdr,
  
  void _hfi1_do_send(struct work_struct *work);