| Message ID | 1523755014-1276-1-git-send-email-yanjun.zhu@oracle.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Sat, Apr 14, 2018 at 09:16:54PM -0400, Zhu Yanjun wrote: > The header file fs_helpers.h is included twice. So it should be removed. > > CC: Srinivas Eeda <srinivas.eeda@oracle.com> > CC: Junxiao Bi <junxiao.bi@oracle.com> > Signed-off-by: Zhu Yanjun <yanjun.zhu@oracle.com> > --- > V1->V2: fix typo error. > --- > drivers/infiniband/hw/mlx5/main.c | 1 - > 1 file changed, 1 deletion(-) Thanks, Acked-by: Leon Romanovsky <leonro@mellanox.com>
On Sat, Apr 14, 2018 at 09:16:54PM -0400, Zhu Yanjun wrote: > The header file fs_helpers.h is included twice. So it should be removed. > > CC: Srinivas Eeda <srinivas.eeda@oracle.com> > CC: Junxiao Bi <junxiao.bi@oracle.com> > Signed-off-by: Zhu Yanjun <yanjun.zhu@oracle.com> > Acked-by: Leon Romanovsky <leonro@mellanox.com> > V1->V2: fix typo error. > drivers/infiniband/hw/mlx5/main.c | 1 - > 1 file changed, 1 deletion(-) Applied to for-rc I revised it though to remove the first fs_helpers.h (as that was the one wrongly added) and added a Fixed line for 802c2125689d which introduced the duplication this merge window 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/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c index daa919e..c5e1bbb 100644 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c @@ -61,7 +61,6 @@ #include "mlx5_ib.h" #include "ib_rep.h" #include "cmd.h" -#include <linux/mlx5/fs_helpers.h> #include <linux/mlx5/accel.h> #include <rdma/uverbs_std_types.h> #include <rdma/mlx5_user_ioctl_verbs.h>
The header file fs_helpers.h is included twice. So it should be removed. CC: Srinivas Eeda <srinivas.eeda@oracle.com> CC: Junxiao Bi <junxiao.bi@oracle.com> Signed-off-by: Zhu Yanjun <yanjun.zhu@oracle.com> --- V1->V2: fix typo error. --- drivers/infiniband/hw/mlx5/main.c | 1 - 1 file changed, 1 deletion(-)