Hi Doug and Jason, Here are a couple clean up patches that could go to for-next. Whether that is the current merge window or the next. They are pretty simple so the merge window might work out OK. I split these out from some more in depth changes that you will probably want to push off till 4.20. --- Dennis Dalessandro (1): IB/hfi1: Rework file list in Makefile Michael J. Ruhl (2): IB/hfi1: Remove duplicated defines IB/hfi1: tune_pcie_caps is arbitrarily placed, poorly drivers/infiniband/hw/hfi1/Makefile | 40 ++++++++++++++++++++++++++++++----- drivers/infiniband/hw/hfi1/chip.c | 6 +++++ drivers/infiniband/hw/hfi1/hfi.h | 1 + drivers/infiniband/hw/hfi1/pcie.c | 18 +++++++--------- drivers/infiniband/hw/hfi1/sdma.h | 10 --------- 5 files changed, 49 insertions(+), 26 deletions(-) -- -Denny