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

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

diff --cc drivers/infiniband/hw/hfi1/chip.c
Simple merge

diff --cc drivers/infiniband/hw/hfi1/chip.h
Simple merge

diff --cc drivers/infiniband/hw/hfi1/firmware.c
Simple merge

diff --cc drivers/infiniband/hw/hfi1/rc.c
Simple merge

diff --cc drivers/infiniband/hw/hfi1/trace.c
Simple merge

diff --cc drivers/infiniband/hw/hfi1/verbs.c
index 8acdb5d,726c064..a985a22
--- 1/drivers/infiniband/hw/hfi1/verbs.c
--- 2/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) {
                /*

diff --cc drivers/infiniband/sw/rdmavt/qp.c
Simple merge