| Message ID | 20180314040132.GA20236@ziepe.ca (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Jason Gunthorpe |
| Headers | show |
On Tue, Mar 13, 2018 at 10:01:32PM -0600, Jason Gunthorpe wrote: > All of these defines are part of the uABI for the driver, this > header duplicates providers/i40iw/i40iw-abi.h in rdma-core. > > Signed-off-by: Jason Gunthorpe <jgg@mellanox.com> > --- Looks ok. Acked-by: Shiraz Saleem <shiraz.saleem@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 Tue, Mar 13, 2018 at 10:01:32PM -0600, Jason Gunthorpe wrote: > All of these defines are part of the uABI for the driver, this > header duplicates providers/i40iw/i40iw-abi.h in rdma-core. > > Signed-off-by: Jason Gunthorpe <jgg@mellanox.com> > Acked-by: Shiraz Saleem <shiraz.saleem@intel.com> > --- > drivers/infiniband/hw/i40iw/i40iw.h | 2 +- > .../hw/i40iw/i40iw_ucontext.h => include/uapi/rdma/i40iw-abi.h | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > rename drivers/infiniband/hw/i40iw/i40iw_ucontext.h => include/uapi/rdma/i40iw-abi.h (98%) Applied to for-next Jason -- 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
diff --git a/drivers/infiniband/hw/i40iw/i40iw.h b/drivers/infiniband/hw/i40iw/i40iw.h index a20650f060ce93..50dc50e8391806 100644 --- a/drivers/infiniband/hw/i40iw/i40iw.h +++ b/drivers/infiniband/hw/i40iw/i40iw.h @@ -60,7 +60,7 @@ #include <i40e_client.h> #include "i40iw_type.h" #include "i40iw_p.h" -#include "i40iw_ucontext.h" +#include <rdma/i40iw-abi.h> #include "i40iw_pble.h" #include "i40iw_verbs.h" #include "i40iw_cm.h" diff --git a/drivers/infiniband/hw/i40iw/i40iw_ucontext.h b/include/uapi/rdma/i40iw-abi.h similarity index 98% rename from drivers/infiniband/hw/i40iw/i40iw_ucontext.h rename to include/uapi/rdma/i40iw-abi.h index 57d3f1d11ff1f5..bfc3aaf2e56a5b 100644 --- a/drivers/infiniband/hw/i40iw/i40iw_ucontext.h +++ b/include/uapi/rdma/i40iw-abi.h @@ -34,8 +34,8 @@ * */ -#ifndef I40IW_USER_CONTEXT_H -#define I40IW_USER_CONTEXT_H +#ifndef I40IW_ABI_H +#define I40IW_ABI_H #include <linux/types.h>
All of these defines are part of the uABI for the driver, this header duplicates providers/i40iw/i40iw-abi.h in rdma-core. Signed-off-by: Jason Gunthorpe <jgg@mellanox.com> --- drivers/infiniband/hw/i40iw/i40iw.h | 2 +- .../hw/i40iw/i40iw_ucontext.h => include/uapi/rdma/i40iw-abi.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename drivers/infiniband/hw/i40iw/i40iw_ucontext.h => include/uapi/rdma/i40iw-abi.h (98%) Ugh, somehow the wrong version of this got sent, the first hunk was missed. Sorry.