[dpdk-stable] patch 'net/sfc/base: properly align on line continuation' has been queued to LTS release 17.11.5
Yongseok Koh
yskoh at mellanox.com
Fri Nov 30 00:10:10 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 5ecf3584ca0c17fcc4bd28328acd15310d838604 Mon Sep 17 00:00:00 2001
From: Andy Moreton <amoreton at solarflare.com>
Date: Mon, 10 Sep 2018 10:33:05 +0100
Subject: [PATCH] net/sfc/base: properly align on line continuation
[ upstream commit 9d42b13e8c2bd325e7c9735830a2f65e3f14b41c ]
Fixes: 19b64c6ac35f ("net/sfc/base: import libefx base")
Signed-off-by: Andy Moreton <amoreton at solarflare.com>
Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
---
drivers/net/sfc/base/efx_nic.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/sfc/base/efx_nic.c b/drivers/net/sfc/base/efx_nic.c
index 76caa744c..adc62341c 100644
--- a/drivers/net/sfc/base/efx_nic.c
+++ b/drivers/net/sfc/base/efx_nic.c
@@ -587,7 +587,7 @@ efx_nic_reset(
*/
mod_flags = enp->en_mod_flags;
mod_flags &= ~(EFX_MOD_MCDI | EFX_MOD_PROBE | EFX_MOD_NVRAM |
- EFX_MOD_VPD | EFX_MOD_MON);
+ EFX_MOD_VPD | EFX_MOD_MON);
EFSYS_ASSERT3U(mod_flags, ==, 0);
if (mod_flags != 0) {
rc = EINVAL;
--
2.11.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2018-11-29 15:01:46.004628513 -0800
+++ 0016-net-sfc-base-properly-align-on-line-continuation.patch 2018-11-29 15:01:44.997960000 -0800
@@ -1,10 +1,11 @@
-From 9d42b13e8c2bd325e7c9735830a2f65e3f14b41c Mon Sep 17 00:00:00 2001
+From 5ecf3584ca0c17fcc4bd28328acd15310d838604 Mon Sep 17 00:00:00 2001
From: Andy Moreton <amoreton at solarflare.com>
Date: Mon, 10 Sep 2018 10:33:05 +0100
Subject: [PATCH] net/sfc/base: properly align on line continuation
+[ upstream commit 9d42b13e8c2bd325e7c9735830a2f65e3f14b41c ]
+
Fixes: 19b64c6ac35f ("net/sfc/base: import libefx base")
-Cc: stable at dpdk.org
Signed-off-by: Andy Moreton <amoreton at solarflare.com>
Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
@@ -13,10 +14,10 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/sfc/base/efx_nic.c b/drivers/net/sfc/base/efx_nic.c
-index 6c162e035..6314ae2ff 100644
+index 76caa744c..adc62341c 100644
--- a/drivers/net/sfc/base/efx_nic.c
+++ b/drivers/net/sfc/base/efx_nic.c
-@@ -559,7 +559,7 @@ efx_nic_reset(
+@@ -587,7 +587,7 @@ efx_nic_reset(
*/
mod_flags = enp->en_mod_flags;
mod_flags &= ~(EFX_MOD_MCDI | EFX_MOD_PROBE | EFX_MOD_NVRAM |
More information about the stable
mailing list