| Message ID | 1544601818-134205-1-git-send-email-yuehaibing@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 186599f89ea57e9b444dcb0793723b9148770161 |
| Headers | show |
| Series | [net-next] net/mlx5: Remove duplicated include from eswitch.c | expand |
On Wed, Dec 12, 2018 at 08:03:38AM +0000, YueHaibing wrote: > Remove duplicated include. > > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > --- > drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 1 - > 1 file changed, 1 deletion(-) > Thanks, Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
From: YueHaibing <yuehaibing@huawei.com> Date: Wed, 12 Dec 2018 08:03:38 +0000 > Remove duplicated include. > > Signed-off-by: YueHaibing <yuehaibing@huawei.com> Saeed, how would you like me to handle small fixes like this which have been explicitly ACK'd by a Mellanox developer? Do you want me to apply them directly or wait to get them from you in your next pull request? Thanks.
On Wed, 2018-12-12 at 10:55 -0800, David Miller wrote: > From: YueHaibing <yuehaibing@huawei.com> > Date: Wed, 12 Dec 2018 08:03:38 +0000 > > > Remove duplicated include. > > > > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > > Saeed, how would you like me to handle small fixes like this which > have been > explicitly ACK'd by a Mellanox developer? > > Do you want me to apply them directly or wait to get them from you in > your > next pull request? > Let's do the following, if I ACK them then you can apply them directly, otherwise i will notify and apply them to my branch and send them later to avoid any confusion or conflict with our shared branch. Does that work for you ? if not then you can always leave them to me. Thanks !
From: Saeed Mahameed <saeedm@mellanox.com> Date: Wed, 12 Dec 2018 20:27:59 +0000 > On Wed, 2018-12-12 at 10:55 -0800, David Miller wrote: >> From: YueHaibing <yuehaibing@huawei.com> >> Date: Wed, 12 Dec 2018 08:03:38 +0000 >> >> > Remove duplicated include. >> > >> > Signed-off-by: YueHaibing <yuehaibing@huawei.com> >> >> Saeed, how would you like me to handle small fixes like this which >> have been >> explicitly ACK'd by a Mellanox developer? >> >> Do you want me to apply them directly or wait to get them from you in >> your >> next pull request? >> > > Let's do the following, if I ACK them then you can apply them directly, > otherwise i will notify and apply them to my branch and send them later > to avoid any confusion or conflict with our shared branch. > > Does that work for you ? if not then you can always leave them to me. That works for me, I'll apply directly only with your explicit ACK, thanks Saeed.
On Wed, 2018-12-12 at 08:03 +0000, YueHaibing wrote: > Remove duplicated include. > > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > Applied to mlx5-next Thanks!
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c index e6a9b19..4f9dd0d 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c @@ -39,7 +39,6 @@ #include "lib/eq.h" #include "eswitch.h" #include "fs_core.h" -#include "lib/eq.h" #define UPLINK_VPORT 0xFFFF
Remove duplicated include. Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 1 - 1 file changed, 1 deletion(-)