Here are some clean up patches, for the driver mersion that got missed and diagpkt removal. Doug has two fixes as well. --- Dennis Dalessandro (4): RDMA/hfi1: Fix potential integer multiplication overflow errors RDMA/hfi1: Remove pointless driver version RDMA/hfi1: Consolidate software versions RDMA/hfi1: Remove all traces of diagpkt support Douglas Miller (2): RDMA/hfi1: Prevent use of lock before it is initialized RDMA/hfi1: Prevent panic when SDMA is disabled drivers/infiniband/hw/hfi1/common.h | 55 --------------------------------- drivers/infiniband/hw/hfi1/driver.c | 6 ---- drivers/infiniband/hw/hfi1/file_ops.c | 5 ++- drivers/infiniband/hw/hfi1/init.c | 2 + drivers/infiniband/hw/hfi1/sdma.c | 12 ++++--- 5 files changed, 12 insertions(+), 68 deletions(-) -- -Denny