From: Doug Ledford <dledford@redhat.com>
Date: Wed, 18 Oct 2017 14:15:14 +0000 (-0400)
Subject: Merge branch 'hfi1' into k.o/for-next
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e527ff92b69f0fc184b22038fd600aec7bf0ce61;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'hfi1' into k.o/for-next

Signed-off-by: Doug Ledford <dledford@redhat.com>
---

e527ff92b69f0fc184b22038fd600aec7bf0ce61
diff --cc drivers/infiniband/hw/hfi1/verbs.c
index 8acdb5dded24,726c064b22d8..a985a224cdf9
--- a/drivers/infiniband/hw/hfi1/verbs.c
+++ b/drivers/infiniband/hw/hfi1/verbs.c
@@@ -812,8 -815,8 +815,7 @@@ static int build_verbs_tx_desc
  	int ret = 0;
  	struct hfi1_sdma_header *phdr = &tx->phdr;
  	u16 hdrbytes = tx->hdr_dwords << 2;
 -	u32 *hdr;
  	u8 extra_bytes = 0;
- 	static char trail_buf[12]; /* CRC = 4, LT = 1, Pad = 0 to 7 bytes */
  
  	if (tx->phdr.hdr.hdr_type) {
  		/*