From: Anirudh Venkataramanan <[email protected]>
[ Upstream commit 9ea47d81a7f17c6b77211ab75fbca2127719ad39 ]
Remove the "ice" prefix for the driver version string and bump version
to 0.7.1-k.
Signed-off-by: Anirudh Venkataramanan <[email protected]>
Tested-by: Tony Brelinski <[email protected]>
Signed-off-by: Jeff Kirsher <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
---
drivers/net/ethernet/intel/ice/ice_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index e1f95e7a51393..00c833cd2b3ae 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -7,7 +7,7 @@
#include "ice.h"
-#define DRV_VERSION "ice-0.7.0-k"
+#define DRV_VERSION "0.7.1-k"
#define DRV_SUMMARY "Intel(R) Ethernet Connection E800 Series Linux Driver"
const char ice_drv_ver[] = DRV_VERSION;
static const char ice_driver_string[] = DRV_SUMMARY;
--
2.20.1
On Tue 2019-11-19 06:14:22, Greg Kroah-Hartman wrote:
> From: Anirudh Venkataramanan <[email protected]>
>
> [ Upstream commit 9ea47d81a7f17c6b77211ab75fbca2127719ad39 ]
>
> Remove the "ice" prefix for the driver version string and bump version
> to 0.7.1-k.
This sounds like a bad idea. 0.7.1 in mainline contains patches that
were not backported to stable, so marking this as 0.7.1 version is
wrong.
Best regards,
Pavel
> +++ b/drivers/net/ethernet/intel/ice/ice_main.c
> @@ -7,7 +7,7 @@
>
> #include "ice.h"
>
> -#define DRV_VERSION "ice-0.7.0-k"
> +#define DRV_VERSION "0.7.1-k"
> #define DRV_SUMMARY "Intel(R) Ethernet Connection E800 Series Linux Driver"
> const char ice_drv_ver[] = DRV_VERSION;
> static const char ice_driver_string[] = DRV_SUMMARY;
> --
> 2.20.1
>
>
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
On Wed, 2019-11-20 at 22:59 +0100, Pavel Machek wrote:
> On Tue 2019-11-19 06:14:22, Greg Kroah-Hartman wrote:
> > From: Anirudh Venkataramanan <[email protected]>
> >
> > [ Upstream commit 9ea47d81a7f17c6b77211ab75fbca2127719ad39 ]
> >
> > Remove the "ice" prefix for the driver version string and bump
> > version
> > to 0.7.1-k.
>
> This sounds like a bad idea. 0.7.1 in mainline contains patches that
> were not backported to stable, so marking this as 0.7.1 version is
> wrong.
I agree, backporting this change to stable should not happen.
NAK
>
> > +++ b/drivers/net/ethernet/intel/ice/ice_main.c
> > @@ -7,7 +7,7 @@
> >
> > #include "ice.h"
> >
> > -#define DRV_VERSION "ice-0.7.0-k"
> > +#define DRV_VERSION "0.7.1-k"
> > #define DRV_SUMMARY "Intel(R) Ethernet Connection E800
> > Series Linux Driver"
> > const char ice_drv_ver[] = DRV_VERSION;
> > static const char ice_driver_string[] = DRV_SUMMARY;
> > --
> > 2.20.1
> >
> >
On Wed, Nov 20, 2019 at 10:59:05PM +0100, Pavel Machek wrote:
> On Tue 2019-11-19 06:14:22, Greg Kroah-Hartman wrote:
> > From: Anirudh Venkataramanan <[email protected]>
> >
> > [ Upstream commit 9ea47d81a7f17c6b77211ab75fbca2127719ad39 ]
> >
> > Remove the "ice" prefix for the driver version string and bump version
> > to 0.7.1-k.
>
> This sounds like a bad idea. 0.7.1 in mainline contains patches that
> were not backported to stable, so marking this as 0.7.1 version is
> wrong.
>
> Best regards,
> Pavel
>
> > +++ b/drivers/net/ethernet/intel/ice/ice_main.c
> > @@ -7,7 +7,7 @@
> >
> > #include "ice.h"
> >
> > -#define DRV_VERSION "ice-0.7.0-k"
> > +#define DRV_VERSION "0.7.1-k"
Hah, this is why "versions" for drivers are totally meaningless and why
we removed them from most of the kernel tree already. I recommend doing
that here as well.
thanks,
greg k-h