[dpdk-stable] patch 'net/sfc/base: fix build because of no declaration' has been queued to LTS release 17.11.5

Yongseok Koh yskoh at mellanox.com
Fri Nov 30 00:10:11 CET 2018


Hi,

FYI, your patch has been queued to LTS release 17.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/01/18. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From a764a415b70f58d939a0ed0c7665d529e8ec2aad Mon Sep 17 00:00:00 2001
From: Andrew Rybchenko <arybchenko at solarflare.com>
Date: Mon, 10 Sep 2018 10:33:07 +0100
Subject: [PATCH] net/sfc/base: fix build because of no declaration

[ upstream commit 5d23ac47e940f78bf6d95e6e52d3e0b9c486b8dd ]

Functions declared in mcdi_mon.h are implemented in mcdi_mon.c.
The build fails if compiler options require declaration before definition.

Fixes: dfb3b1ce15f6 ("net/sfc/base: import monitors access via MCDI")

Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
---
 drivers/net/sfc/base/mcdi_mon.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/sfc/base/mcdi_mon.c b/drivers/net/sfc/base/mcdi_mon.c
index c5360c31c..6fe6a22c4 100644
--- a/drivers/net/sfc/base/mcdi_mon.c
+++ b/drivers/net/sfc/base/mcdi_mon.c
@@ -30,6 +30,7 @@
 
 #include "efx.h"
 #include "efx_impl.h"
+#include "mcdi_mon.h"
 
 #if EFSYS_OPT_MON_MCDI
 
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-29 15:01:46.046086950 -0800
+++ 0017-net-sfc-base-fix-build-because-of-no-declaration.patch	2018-11-29 15:01:44.998965000 -0800
@@ -1,13 +1,14 @@
-From 5d23ac47e940f78bf6d95e6e52d3e0b9c486b8dd Mon Sep 17 00:00:00 2001
+From a764a415b70f58d939a0ed0c7665d529e8ec2aad Mon Sep 17 00:00:00 2001
 From: Andrew Rybchenko <arybchenko at solarflare.com>
 Date: Mon, 10 Sep 2018 10:33:07 +0100
 Subject: [PATCH] net/sfc/base: fix build because of no declaration
 
+[ upstream commit 5d23ac47e940f78bf6d95e6e52d3e0b9c486b8dd ]
+
 Functions declared in mcdi_mon.h are implemented in mcdi_mon.c.
 The build fails if compiler options require declaration before definition.
 
 Fixes: dfb3b1ce15f6 ("net/sfc/base: import monitors access via MCDI")
-Cc: stable at dpdk.org
 
 Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
 ---
@@ -15,10 +16,10 @@
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/net/sfc/base/mcdi_mon.c b/drivers/net/sfc/base/mcdi_mon.c
-index 940bd0265..8c0b6f0d9 100644
+index c5360c31c..6fe6a22c4 100644
 --- a/drivers/net/sfc/base/mcdi_mon.c
 +++ b/drivers/net/sfc/base/mcdi_mon.c
-@@ -6,6 +6,7 @@
+@@ -30,6 +30,7 @@
  
  #include "efx.h"
  #include "efx_impl.h"


More information about the stable mailing list