[dpdk-stable] patch 'net/sfc/base: fix SAL annotation for input buffers' has been queued to stable release 18.08.1
Kevin Traynor
ktraynor at redhat.com
Wed Nov 21 17:03:54 CET 2018
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 f3cc1fb2fc757e9a1ff5e53552900ed6984cbd77 Mon Sep 17 00:00:00 2001
From: Martin Harvey <mharvey at solarflare.com>
Date: Mon, 10 Sep 2018 10:33:04 +0100
Subject: [PATCH] net/sfc/base: fix SAL annotation for input buffers
[ upstream commit d0e22de5bd4da4c28dafc4b09e9631b37d302b21 ]
Fixes: d96a34d165b1 ("net/sfc/base: import NVRAM support")
Signed-off-by: Martin Harvey <mharvey at solarflare.com>
Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
---
drivers/net/sfc/base/ef10_impl.h | 2 +-
drivers/net/sfc/base/ef10_nvram.c | 2 +-
drivers/net/sfc/base/efx_impl.h | 2 +-
drivers/net/sfc/base/efx_nvram.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/sfc/base/ef10_impl.h b/drivers/net/sfc/base/ef10_impl.h
index 4751faf16..fb0d98875 100644
--- a/drivers/net/sfc/base/ef10_impl.h
+++ b/drivers/net/sfc/base/ef10_impl.h
@@ -454,5 +454,5 @@ ef10_nvram_partn_write(
__in uint32_t partn,
__in unsigned int offset,
- __out_bcount(size) caddr_t data,
+ __in_bcount(size) caddr_t data,
__in size_t size);
diff --git a/drivers/net/sfc/base/ef10_nvram.c b/drivers/net/sfc/base/ef10_nvram.c
index 0d885ccdf..46838dd75 100644
--- a/drivers/net/sfc/base/ef10_nvram.c
+++ b/drivers/net/sfc/base/ef10_nvram.c
@@ -2001,5 +2001,5 @@ ef10_nvram_partn_write(
__in uint32_t partn,
__in unsigned int offset,
- __out_bcount(size) caddr_t data,
+ __in_bcount(size) caddr_t data,
__in size_t size)
{
diff --git a/drivers/net/sfc/base/efx_impl.h b/drivers/net/sfc/base/efx_impl.h
index 548834f90..637e31e0c 100644
--- a/drivers/net/sfc/base/efx_impl.h
+++ b/drivers/net/sfc/base/efx_impl.h
@@ -584,5 +584,5 @@ efx_mcdi_nvram_write(
__in uint32_t partn,
__in uint32_t offset,
- __out_bcount(size) caddr_t data,
+ __in_bcount(size) caddr_t data,
__in size_t size);
diff --git a/drivers/net/sfc/base/efx_nvram.c b/drivers/net/sfc/base/efx_nvram.c
index be409c3af..f3107bbb5 100644
--- a/drivers/net/sfc/base/efx_nvram.c
+++ b/drivers/net/sfc/base/efx_nvram.c
@@ -866,5 +866,5 @@ efx_mcdi_nvram_write(
__in uint32_t partn,
__in uint32_t offset,
- __out_bcount(size) caddr_t data,
+ __in_bcount(size) caddr_t data,
__in size_t size)
{
--
2.19.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2018-11-21 15:59:13.731772278 +0000
+++ 0004-net-sfc-base-fix-SAL-annotation-for-input-buffers.patch 2018-11-21 15:59:13.000000000 +0000
@@ -1,10 +1,11 @@
-From d0e22de5bd4da4c28dafc4b09e9631b37d302b21 Mon Sep 17 00:00:00 2001
+From f3cc1fb2fc757e9a1ff5e53552900ed6984cbd77 Mon Sep 17 00:00:00 2001
From: Martin Harvey <mharvey at solarflare.com>
Date: Mon, 10 Sep 2018 10:33:04 +0100
Subject: [PATCH] net/sfc/base: fix SAL annotation for input buffers
+[ upstream commit d0e22de5bd4da4c28dafc4b09e9631b37d302b21 ]
+
Fixes: d96a34d165b1 ("net/sfc/base: import NVRAM support")
-Cc: stable at dpdk.org
Signed-off-by: Martin Harvey <mharvey at solarflare.com>
Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
More information about the stable
mailing list