Message ID | 1520825428-6654-1-git-send-email-yanjun.zhu@oracle.com (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
On 3/11/2018 11:30 PM, Zhu Yanjun wrote: > In hfi.h, the header file opa_addr.h is included twice. > In vt.h, the header file mmap.h is included twice. > > Signed-off-by: Zhu Yanjun <yanjun.zhu@oracle.com> Acked-by: Dennis Dalessandro <dennis.dalessandro@intel.com> -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, 2018-03-12 at 08:32 -0400, Dennis Dalessandro wrote: > On 3/11/2018 11:30 PM, Zhu Yanjun wrote: > > In hfi.h, the header file opa_addr.h is included twice. > > In vt.h, the header file mmap.h is included twice. > > > > Signed-off-by: Zhu Yanjun <yanjun.zhu@oracle.com> > > Acked-by: Dennis Dalessandro <dennis.dalessandro@intel.com> Thanks, applied to for-next.
diff --git a/drivers/infiniband/hw/hfi1/hfi.h b/drivers/infiniband/hw/hfi1/hfi.h index 90bc8c7..32c4826 100644 --- a/drivers/infiniband/hw/hfi1/hfi.h +++ b/drivers/infiniband/hw/hfi1/hfi.h @@ -70,7 +70,6 @@ #include <linux/rhashtable.h> #include <linux/netdevice.h> #include <rdma/rdma_vt.h> -#include <rdma/opa_addr.h> #include "chip_registers.h" #include "common.h" diff --git a/drivers/infiniband/sw/rdmavt/vt.h b/drivers/infiniband/sw/rdmavt/vt.h index 8823b2e..0675ea6 100644 --- a/drivers/infiniband/sw/rdmavt/vt.h +++ b/drivers/infiniband/sw/rdmavt/vt.h @@ -59,7 +59,6 @@ #include "mmap.h" #include "cq.h" #include "mad.h" -#include "mmap.h" #define rvt_pr_info(rdi, fmt, ...) \ __rvt_pr_info(rdi->driver_f.get_pci_dev(rdi), \
In hfi.h, the header file opa_addr.h is included twice. In vt.h, the header file mmap.h is included twice. Signed-off-by: Zhu Yanjun <yanjun.zhu@oracle.com> --- drivers/infiniband/hw/hfi1/hfi.h | 1 - drivers/infiniband/sw/rdmavt/vt.h | 1 - 2 files changed, 2 deletions(-)