[dpdk-stable] patch 'net/sfc/base: properly align on line continuation' has been queued to stable release 18.08.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 18.08.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/26/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.

Kevin Traynor

---
>From a3cc3f5aa30890c37318b22a13f4e9c31be1de45 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 6c162e035..6314ae2ff 100644
--- a/drivers/net/sfc/base/efx_nic.c
+++ b/drivers/net/sfc/base/efx_nic.c
@@ -560,5 +560,5 @@ 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) {
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-21 15:59:13.758418387 +0000
+++ 0005-net-sfc-base-properly-align-on-line-continuation.patch	2018-11-21 15:59:13.000000000 +0000
@@ -1,10 +1,11 @@
-From 9d42b13e8c2bd325e7c9735830a2f65e3f14b41c Mon Sep 17 00:00:00 2001
+From a3cc3f5aa30890c37318b22a13f4e9c31be1de45 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>