2020-12-07 12:05:14

by Zou Wei

[permalink] [raw]
Subject: [PATCH -next] net/mlx5_core: remove unused including <generated/utsrelease.h>

Remove including <generated/utsrelease.h> that don't need it.

Signed-off-by: Zou Wei <[email protected]>
---
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
index 989c70c..82ecc161 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
@@ -30,7 +30,6 @@
* SOFTWARE.
*/

-#include <generated/utsrelease.h>
#include <linux/mlx5/fs.h>
#include <net/switchdev.h>
#include <net/pkt_cls.h>
--
2.6.2


2020-12-08 21:06:53

by Jakub Kicinski

[permalink] [raw]
Subject: Re: [PATCH -next] net/mlx5_core: remove unused including <generated/utsrelease.h>

On Mon, 7 Dec 2020 20:14:00 +0800 Zou Wei wrote:
> Remove including <generated/utsrelease.h> that don't need it.
>
> Signed-off-by: Zou Wei <[email protected]>
> ---
> drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
> index 989c70c..82ecc161 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
> @@ -30,7 +30,6 @@
> * SOFTWARE.
> */
>
> -#include <generated/utsrelease.h>
> #include <linux/mlx5/fs.h>
> #include <net/switchdev.h>
> #include <net/pkt_cls.h>


drivers/net/ethernet/mellanox/mlx5/core/en_rep.c: In function ‘mlx5e_rep_get_drvinfo’:
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c:66:28: error: ‘UTS_RELEASE’ undeclared (first use in this function); did you mean ‘CSS_RELEASED’?
66 | strlcpy(drvinfo->version, UTS_RELEASE, sizeof(drvinfo->version));
| ^~~~~~~~~~~
| CSS_RELEASED
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c:66:28: note: each undeclared identifier is reported only once for each function it appears in
make[6]: *** [drivers/net/ethernet/mellanox/mlx5/core/en_rep.o] Error 1
make[5]: *** [drivers/net/ethernet/mellanox/mlx5/core] Error 2
make[4]: *** [drivers/net/ethernet/mellanox] Error 2
make[3]: *** [drivers/net/ethernet] Error 2
make[2]: *** [drivers/net] Error 2
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [drivers] Error 2
make: *** [__sub-make] Error 2

2020-12-09 06:26:20

by Leon Romanovsky

[permalink] [raw]
Subject: Re: [PATCH -next] net/mlx5_core: remove unused including <generated/utsrelease.h>

On Tue, Dec 08, 2020 at 11:22:26AM -0800, Jakub Kicinski wrote:
> On Mon, 7 Dec 2020 20:14:00 +0800 Zou Wei wrote:
> > Remove including <generated/utsrelease.h> that don't need it.
> >
> > Signed-off-by: Zou Wei <[email protected]>
> > ---
> > drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 1 -
> > 1 file changed, 1 deletion(-)
> >
> > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
> > index 989c70c..82ecc161 100644
> > --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
> > +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
> > @@ -30,7 +30,6 @@
> > * SOFTWARE.
> > */
> >
> > -#include <generated/utsrelease.h>
> > #include <linux/mlx5/fs.h>
> > #include <net/switchdev.h>
> > #include <net/pkt_cls.h>

Jakub,

You probably doesn't have latest net-next.

In the commit 17a7612b99e6 ("net/mlx5_core: Clean driver version and
name"), I removed "strlcpy(drvinfo->version, UTS_RELEASE,
sizeof(drvinfo->version));" line.

The patch is ok, but should have Fixes line.
Fixes: 17a7612b99e6 ("net/mlx5_core: Clean driver version and name")

Thanks

>
>
> drivers/net/ethernet/mellanox/mlx5/core/en_rep.c: In function ‘mlx5e_rep_get_drvinfo’:
> drivers/net/ethernet/mellanox/mlx5/core/en_rep.c:66:28: error: ‘UTS_RELEASE’ undeclared (first use in this function); did you mean ‘CSS_RELEASED’?
> 66 | strlcpy(drvinfo->version, UTS_RELEASE, sizeof(drvinfo->version));
> | ^~~~~~~~~~~
> | CSS_RELEASED
> drivers/net/ethernet/mellanox/mlx5/core/en_rep.c:66:28: note: each undeclared identifier is reported only once for each function it appears in
> make[6]: *** [drivers/net/ethernet/mellanox/mlx5/core/en_rep.o] Error 1
> make[5]: *** [drivers/net/ethernet/mellanox/mlx5/core] Error 2
> make[4]: *** [drivers/net/ethernet/mellanox] Error 2
> make[3]: *** [drivers/net/ethernet] Error 2
> make[2]: *** [drivers/net] Error 2
> make[2]: *** Waiting for unfinished jobs....
> make[1]: *** [drivers] Error 2
> make: *** [__sub-make] Error 2

2020-12-09 06:45:33

by Zou Wei

[permalink] [raw]
Subject: 答复: [PATCH -next] net/mlx5_core: remove u nused including <generated/utsrelease.h>

ok, I will add the Fixes line and send the v2 soon.

-----邮件原件-----
发件人: Leon Romanovsky [mailto:[email protected]]
发送时间: 2020年12月9日 14:21
收件人: Jakub Kicinski <[email protected]>
抄送: Zouwei (Samuel) <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
主题: Re: [PATCH -next] net/mlx5_core: remove unused including <generated/utsrelease.h>

On Tue, Dec 08, 2020 at 11:22:26AM -0800, Jakub Kicinski wrote:
> On Mon, 7 Dec 2020 20:14:00 +0800 Zou Wei wrote:
> > Remove including <generated/utsrelease.h> that don't need it.
> >
> > Signed-off-by: Zou Wei <[email protected]>
> > ---
> > drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 1 -
> > 1 file changed, 1 deletion(-)
> >
> > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
> > b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
> > index 989c70c..82ecc161 100644
> > --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
> > +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
> > @@ -30,7 +30,6 @@
> > * SOFTWARE.
> > */
> >
> > -#include <generated/utsrelease.h>
> > #include <linux/mlx5/fs.h>
> > #include <net/switchdev.h>
> > #include <net/pkt_cls.h>

Jakub,

You probably doesn't have latest net-next.

In the commit 17a7612b99e6 ("net/mlx5_core: Clean driver version and name"), I removed "strlcpy(drvinfo->version, UTS_RELEASE, sizeof(drvinfo->version));" line.

The patch is ok, but should have Fixes line.
Fixes: 17a7612b99e6 ("net/mlx5_core: Clean driver version and name")

Thanks

>
>
> drivers/net/ethernet/mellanox/mlx5/core/en_rep.c: In function ‘mlx5e_rep_get_drvinfo’:
> drivers/net/ethernet/mellanox/mlx5/core/en_rep.c:66:28: error: ‘UTS_RELEASE’ undeclared (first use in this function); did you mean ‘CSS_RELEASED’?
> 66 | strlcpy(drvinfo->version, UTS_RELEASE, sizeof(drvinfo->version));
> | ^~~~~~~~~~~
> | CSS_RELEASED
> drivers/net/ethernet/mellanox/mlx5/core/en_rep.c:66:28: note: each
> undeclared identifier is reported only once for each function it
> appears in
> make[6]: *** [drivers/net/ethernet/mellanox/mlx5/core/en_rep.o] Error
> 1
> make[5]: *** [drivers/net/ethernet/mellanox/mlx5/core] Error 2
> make[4]: *** [drivers/net/ethernet/mellanox] Error 2
> make[3]: *** [drivers/net/ethernet] Error 2
> make[2]: *** [drivers/net] Error 2
> make[2]: *** Waiting for unfinished jobs....
> make[1]: *** [drivers] Error 2
> make: *** [__sub-make] Error 2

2020-12-09 17:09:07

by Jakub Kicinski

[permalink] [raw]
Subject: Re: [PATCH -next] net/mlx5_core: remove unused including <generated/utsrelease.h>

On Wed, 9 Dec 2020 08:21:00 +0200 Leon Romanovsky wrote:
> On Tue, Dec 08, 2020 at 11:22:26AM -0800, Jakub Kicinski wrote:
> > On Mon, 7 Dec 2020 20:14:00 +0800 Zou Wei wrote:
> > > Remove including <generated/utsrelease.h> that don't need it.
> > >
> > > Signed-off-by: Zou Wei <[email protected]>
> > > ---
> > > drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 1 -
> > > 1 file changed, 1 deletion(-)
> > >
> > > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
> > > index 989c70c..82ecc161 100644
> > > --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
> > > +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
> > > @@ -30,7 +30,6 @@
> > > * SOFTWARE.
> > > */
> > >
> > > -#include <generated/utsrelease.h>
> > > #include <linux/mlx5/fs.h>
> > > #include <net/switchdev.h>
> > > #include <net/pkt_cls.h>
>
> Jakub,
>
> You probably doesn't have latest net-next.
>
> In the commit 17a7612b99e6 ("net/mlx5_core: Clean driver version and
> name"), I removed "strlcpy(drvinfo->version, UTS_RELEASE,
> sizeof(drvinfo->version));" line.
>
> The patch is ok, but should have Fixes line.
> Fixes: 17a7612b99e6 ("net/mlx5_core: Clean driver version and name")

Hm. Pretty sure our build bot gets a fresh copy before testing.
Must had been some timing issue, perhaps? Looks like the commit
came in with the auxbus merge.

2020-12-09 21:06:48

by Jason Gunthorpe

[permalink] [raw]
Subject: Re: [PATCH -next] net/mlx5_core: remove unused including <generated/utsrelease.h>

On Wed, Dec 09, 2020 at 09:04:46AM -0800, Jakub Kicinski wrote:
> On Wed, 9 Dec 2020 08:21:00 +0200 Leon Romanovsky wrote:
> > On Tue, Dec 08, 2020 at 11:22:26AM -0800, Jakub Kicinski wrote:
> > > On Mon, 7 Dec 2020 20:14:00 +0800 Zou Wei wrote:
> > > > Remove including <generated/utsrelease.h> that don't need it.
> > > >
> > > > Signed-off-by: Zou Wei <[email protected]>
> > > > drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 1 -
> > > > 1 file changed, 1 deletion(-)
> > > >
> > > > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
> > > > index 989c70c..82ecc161 100644
> > > > +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
> > > > @@ -30,7 +30,6 @@
> > > > * SOFTWARE.
> > > > */
> > > >
> > > > -#include <generated/utsrelease.h>
> > > > #include <linux/mlx5/fs.h>
> > > > #include <net/switchdev.h>
> > > > #include <net/pkt_cls.h>
> >
> > Jakub,
> >
> > You probably doesn't have latest net-next.
> >
> > In the commit 17a7612b99e6 ("net/mlx5_core: Clean driver version and
> > name"), I removed "strlcpy(drvinfo->version, UTS_RELEASE,
> > sizeof(drvinfo->version));" line.
> >
> > The patch is ok, but should have Fixes line.
> > Fixes: 17a7612b99e6 ("net/mlx5_core: Clean driver version and name")
>
> Hm. Pretty sure our build bot gets a fresh copy before testing.
> Must had been some timing issue, perhaps? Looks like the commit
> came in with the auxbus merge.

mlx5-next is in linux-next independently so people will be sending
fixes against stuff in linux-next before it hits net-next.

Jason