[dpdk-stable] patch 'common/iavf: update copyright' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/24/20. 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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From 0491724e4a3fd338bc421e487a4e7fb119c9ff1c Mon Sep 17 00:00:00 2001
From: Xiaoyun Li <xiaoyun.li at intel.com>
Date: Mon, 18 May 2020 16:45:46 +0800
Subject: [PATCH] common/iavf: update copyright

[ upstream commit 32c3e0b4882b75dcf44ae2faabe2dbba9f17ad2a ]

Clarify Intel copyright and update the date to 2020.

Fixes: 317862a4e44f ("net/iavf: replace license text with SPDX tag")

Signed-off-by: Xiaoyun Li <xiaoyun.li at intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 drivers/net/iavf/base/README        | 2 +-
 drivers/net/iavf/base/iavf_adminq.c | 2 +-
 drivers/net/iavf/base/iavf_adminq.h | 2 +-
 drivers/net/iavf/base/iavf_alloc.h  | 2 +-
 drivers/net/iavf/base/iavf_common.c | 2 +-
 drivers/net/iavf/base/iavf_devids.h | 2 +-
 drivers/net/iavf/base/iavf_osdep.h  | 2 +-
 drivers/net/iavf/base/iavf_status.h | 2 +-
 drivers/net/iavf/base/virtchnl.h    | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/net/iavf/base/README b/drivers/net/iavf/base/README
index f57e1048ff..bc54ab2809 100644
--- a/drivers/net/iavf/base/README
+++ b/drivers/net/iavf/base/README
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2017 Intel Corporation
+ * Copyright(c) 2019-2020 Intel Corporation
  */
 
 Intel® IAVF driver
diff --git a/drivers/net/iavf/base/iavf_adminq.c b/drivers/net/iavf/base/iavf_adminq.c
index a9fc63992d..d6943e8260 100644
--- a/drivers/net/iavf/base/iavf_adminq.c
+++ b/drivers/net/iavf/base/iavf_adminq.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2013 - 2015 Intel Corporation
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
 #include "iavf_status.h"
diff --git a/drivers/net/iavf/base/iavf_adminq.h b/drivers/net/iavf/base/iavf_adminq.h
index 715621644b..f97fe8818e 100644
--- a/drivers/net/iavf/base/iavf_adminq.h
+++ b/drivers/net/iavf/base/iavf_adminq.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2013 - 2015 Intel Corporation
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
 #ifndef _IAVF_ADMINQ_H_
diff --git a/drivers/net/iavf/base/iavf_alloc.h b/drivers/net/iavf/base/iavf_alloc.h
index 4ff307d23d..ef5ce080ad 100644
--- a/drivers/net/iavf/base/iavf_alloc.h
+++ b/drivers/net/iavf/base/iavf_alloc.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2013 - 2015 Intel Corporation
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
 #ifndef _IAVF_ALLOC_H_
diff --git a/drivers/net/iavf/base/iavf_common.c b/drivers/net/iavf/base/iavf_common.c
index 916a8388b2..23f18aa2ec 100644
--- a/drivers/net/iavf/base/iavf_common.c
+++ b/drivers/net/iavf/base/iavf_common.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2013 - 2015 Intel Corporation
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
 #include "iavf_type.h"
diff --git a/drivers/net/iavf/base/iavf_devids.h b/drivers/net/iavf/base/iavf_devids.h
index 2cd88d62f0..08c523f19e 100644
--- a/drivers/net/iavf/base/iavf_devids.h
+++ b/drivers/net/iavf/base/iavf_devids.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2013 - 2015 Intel Corporation
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
 #ifndef _IAVF_DEVIDS_H_
diff --git a/drivers/net/iavf/base/iavf_osdep.h b/drivers/net/iavf/base/iavf_osdep.h
index 6480266937..08b312cbd8 100644
--- a/drivers/net/iavf/base/iavf_osdep.h
+++ b/drivers/net/iavf/base/iavf_osdep.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2017 Intel Corporation
+ * Copyright(c) 2017-2020 Intel Corporation
  */
 
 #ifndef _IAVF_OSDEP_H_
diff --git a/drivers/net/iavf/base/iavf_status.h b/drivers/net/iavf/base/iavf_status.h
index cb91afb017..a981360af6 100644
--- a/drivers/net/iavf/base/iavf_status.h
+++ b/drivers/net/iavf/base/iavf_status.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2013 - 2015 Intel Corporation
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
 #ifndef _IAVF_STATUS_H_
diff --git a/drivers/net/iavf/base/virtchnl.h b/drivers/net/iavf/base/virtchnl.h
index 50f7c8e49e..fa98417b05 100644
--- a/drivers/net/iavf/base/virtchnl.h
+++ b/drivers/net/iavf/base/virtchnl.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2013 - 2015 Intel Corporation
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
 #ifndef _VIRTCHNL_H_
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-22 10:37:40.449748688 +0100
+++ 0031-common-iavf-update-copyright.patch	2020-05-22 10:37:39.196413933 +0100
@@ -1,125 +1,98 @@
-From 32c3e0b4882b75dcf44ae2faabe2dbba9f17ad2a Mon Sep 17 00:00:00 2001
+From 0491724e4a3fd338bc421e487a4e7fb119c9ff1c Mon Sep 17 00:00:00 2001
 From: Xiaoyun Li <xiaoyun.li at intel.com>
 Date: Mon, 18 May 2020 16:45:46 +0800
 Subject: [PATCH] common/iavf: update copyright
 
+[ upstream commit 32c3e0b4882b75dcf44ae2faabe2dbba9f17ad2a ]
+
 Clarify Intel copyright and update the date to 2020.
 
 Fixes: 317862a4e44f ("net/iavf: replace license text with SPDX tag")
-Cc: stable at dpdk.org
 
 Signed-off-by: Xiaoyun Li <xiaoyun.li at intel.com>
 Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
 ---
- drivers/common/iavf/README            | 2 +-
- drivers/common/iavf/iavf_adminq.c     | 2 +-
- drivers/common/iavf/iavf_adminq.h     | 2 +-
- drivers/common/iavf/iavf_adminq_cmd.h | 2 +-
- drivers/common/iavf/iavf_alloc.h      | 2 +-
- drivers/common/iavf/iavf_common.c     | 2 +-
- drivers/common/iavf/iavf_devids.h     | 2 +-
- drivers/common/iavf/iavf_impl.c       | 2 +-
- drivers/common/iavf/iavf_osdep.h      | 2 +-
- drivers/common/iavf/iavf_prototype.h  | 2 +-
- drivers/common/iavf/iavf_register.h   | 2 +-
- drivers/common/iavf/iavf_status.h     | 2 +-
- drivers/common/iavf/iavf_type.h       | 2 +-
- drivers/common/iavf/meson.build       | 2 +-
- drivers/common/iavf/virtchnl.h        | 2 +-
- 15 files changed, 15 insertions(+), 15 deletions(-)
+ drivers/net/iavf/base/README        | 2 +-
+ drivers/net/iavf/base/iavf_adminq.c | 2 +-
+ drivers/net/iavf/base/iavf_adminq.h | 2 +-
+ drivers/net/iavf/base/iavf_alloc.h  | 2 +-
+ drivers/net/iavf/base/iavf_common.c | 2 +-
+ drivers/net/iavf/base/iavf_devids.h | 2 +-
+ drivers/net/iavf/base/iavf_osdep.h  | 2 +-
+ drivers/net/iavf/base/iavf_status.h | 2 +-
+ drivers/net/iavf/base/virtchnl.h    | 2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
 
-diff --git a/drivers/common/iavf/README b/drivers/common/iavf/README
-index 034c7d7adc..f301ff665a 100644
---- a/drivers/common/iavf/README
-+++ b/drivers/common/iavf/README
+diff --git a/drivers/net/iavf/base/README b/drivers/net/iavf/base/README
+index f57e1048ff..bc54ab2809 100644
+--- a/drivers/net/iavf/base/README
++++ b/drivers/net/iavf/base/README
 @@ -1,5 +1,5 @@
  /* SPDX-License-Identifier: BSD-3-Clause
-- * Copyright(c) 2019 Intel Corporation
+- * Copyright(c) 2017 Intel Corporation
 + * Copyright(c) 2019-2020 Intel Corporation
   */
  
  Intel® IAVF driver
-diff --git a/drivers/common/iavf/iavf_adminq.c b/drivers/common/iavf/iavf_adminq.c
-index ca265b0bcd..8bae51a46a 100644
---- a/drivers/common/iavf/iavf_adminq.c
-+++ b/drivers/common/iavf/iavf_adminq.c
+diff --git a/drivers/net/iavf/base/iavf_adminq.c b/drivers/net/iavf/base/iavf_adminq.c
+index a9fc63992d..d6943e8260 100644
+--- a/drivers/net/iavf/base/iavf_adminq.c
++++ b/drivers/net/iavf/base/iavf_adminq.c
 @@ -1,5 +1,5 @@
  /* SPDX-License-Identifier: BSD-3-Clause
-- * Copyright(c) 2001-2020
+- * Copyright(c) 2013 - 2015 Intel Corporation
 + * Copyright(c) 2001-2020 Intel Corporation
   */
  
  #include "iavf_status.h"
-diff --git a/drivers/common/iavf/iavf_adminq.h b/drivers/common/iavf/iavf_adminq.h
-index 40e1336c10..93214162eb 100644
---- a/drivers/common/iavf/iavf_adminq.h
-+++ b/drivers/common/iavf/iavf_adminq.h
+diff --git a/drivers/net/iavf/base/iavf_adminq.h b/drivers/net/iavf/base/iavf_adminq.h
+index 715621644b..f97fe8818e 100644
+--- a/drivers/net/iavf/base/iavf_adminq.h
++++ b/drivers/net/iavf/base/iavf_adminq.h
 @@ -1,5 +1,5 @@
  /* SPDX-License-Identifier: BSD-3-Clause
-- * Copyright(c) 2001-2020
+- * Copyright(c) 2013 - 2015 Intel Corporation
 + * Copyright(c) 2001-2020 Intel Corporation
   */
  
  #ifndef _IAVF_ADMINQ_H_
-diff --git a/drivers/common/iavf/iavf_adminq_cmd.h b/drivers/common/iavf/iavf_adminq_cmd.h
-index c24c2f0a2b..5b748426ad 100644
---- a/drivers/common/iavf/iavf_adminq_cmd.h
-+++ b/drivers/common/iavf/iavf_adminq_cmd.h
-@@ -1,5 +1,5 @@
- /* SPDX-License-Identifier: BSD-3-Clause
-- * Copyright(c) 2001-2020
-+ * Copyright(c) 2001-2020 Intel Corporation
-  */
- 
- #ifndef _IAVF_ADMINQ_CMD_H_
-diff --git a/drivers/common/iavf/iavf_alloc.h b/drivers/common/iavf/iavf_alloc.h
-index e863d2545a..7b7a205cff 100644
---- a/drivers/common/iavf/iavf_alloc.h
-+++ b/drivers/common/iavf/iavf_alloc.h
+diff --git a/drivers/net/iavf/base/iavf_alloc.h b/drivers/net/iavf/base/iavf_alloc.h
+index 4ff307d23d..ef5ce080ad 100644
+--- a/drivers/net/iavf/base/iavf_alloc.h
++++ b/drivers/net/iavf/base/iavf_alloc.h
 @@ -1,5 +1,5 @@
  /* SPDX-License-Identifier: BSD-3-Clause
-- * Copyright(c) 2001-2020
+- * Copyright(c) 2013 - 2015 Intel Corporation
 + * Copyright(c) 2001-2020 Intel Corporation
   */
  
  #ifndef _IAVF_ALLOC_H_
-diff --git a/drivers/common/iavf/iavf_common.c b/drivers/common/iavf/iavf_common.c
-index 6cf159518e..57ec1ff39b 100644
---- a/drivers/common/iavf/iavf_common.c
-+++ b/drivers/common/iavf/iavf_common.c
+diff --git a/drivers/net/iavf/base/iavf_common.c b/drivers/net/iavf/base/iavf_common.c
+index 916a8388b2..23f18aa2ec 100644
+--- a/drivers/net/iavf/base/iavf_common.c
++++ b/drivers/net/iavf/base/iavf_common.c
 @@ -1,5 +1,5 @@
  /* SPDX-License-Identifier: BSD-3-Clause
-- * Copyright(c) 2001-2020
+- * Copyright(c) 2013 - 2015 Intel Corporation
 + * Copyright(c) 2001-2020 Intel Corporation
   */
  
  #include "iavf_type.h"
-diff --git a/drivers/common/iavf/iavf_devids.h b/drivers/common/iavf/iavf_devids.h
-index e6897983ea..2e63aac289 100644
---- a/drivers/common/iavf/iavf_devids.h
-+++ b/drivers/common/iavf/iavf_devids.h
+diff --git a/drivers/net/iavf/base/iavf_devids.h b/drivers/net/iavf/base/iavf_devids.h
+index 2cd88d62f0..08c523f19e 100644
+--- a/drivers/net/iavf/base/iavf_devids.h
++++ b/drivers/net/iavf/base/iavf_devids.h
 @@ -1,5 +1,5 @@
  /* SPDX-License-Identifier: BSD-3-Clause
-- * Copyright(c) 2001-2020
+- * Copyright(c) 2013 - 2015 Intel Corporation
 + * Copyright(c) 2001-2020 Intel Corporation
   */
  
  #ifndef _IAVF_DEVIDS_H_
-diff --git a/drivers/common/iavf/iavf_impl.c b/drivers/common/iavf/iavf_impl.c
-index 70bab4cc66..6174a91440 100644
---- a/drivers/common/iavf/iavf_impl.c
-+++ b/drivers/common/iavf/iavf_impl.c
-@@ -1,5 +1,5 @@
- /* SPDX-License-Identifier: BSD-3-Clause
-- * Copyright(c) 2019 Intel Corporation
-+ * Copyright(c) 2019-2020 Intel Corporation
-  */
- 
- #include <stdio.h>
-diff --git a/drivers/common/iavf/iavf_osdep.h b/drivers/common/iavf/iavf_osdep.h
-index 011b19336e..7cba13ff74 100644
---- a/drivers/common/iavf/iavf_osdep.h
-+++ b/drivers/common/iavf/iavf_osdep.h
+diff --git a/drivers/net/iavf/base/iavf_osdep.h b/drivers/net/iavf/base/iavf_osdep.h
+index 6480266937..08b312cbd8 100644
+--- a/drivers/net/iavf/base/iavf_osdep.h
++++ b/drivers/net/iavf/base/iavf_osdep.h
 @@ -1,5 +1,5 @@
  /* SPDX-License-Identifier: BSD-3-Clause
 - * Copyright(c) 2017 Intel Corporation
@@ -127,68 +100,24 @@
   */
  
  #ifndef _IAVF_OSDEP_H_
-diff --git a/drivers/common/iavf/iavf_prototype.h b/drivers/common/iavf/iavf_prototype.h
-index ed4057b1c0..31ce2af494 100644
---- a/drivers/common/iavf/iavf_prototype.h
-+++ b/drivers/common/iavf/iavf_prototype.h
-@@ -1,5 +1,5 @@
- /* SPDX-License-Identifier: BSD-3-Clause
-- * Copyright(c) 2001-2020
-+ * Copyright(c) 2001-2020 Intel Corporation
-  */
- 
- #ifndef _IAVF_PROTOTYPE_H_
-diff --git a/drivers/common/iavf/iavf_register.h b/drivers/common/iavf/iavf_register.h
-index ee248dcf97..03d62a9da7 100644
---- a/drivers/common/iavf/iavf_register.h
-+++ b/drivers/common/iavf/iavf_register.h
-@@ -1,5 +1,5 @@
- /* SPDX-License-Identifier: BSD-3-Clause
-- * Copyright(c) 2001-2020
-+ * Copyright(c) 2001-2020 Intel Corporation
-  */
- 
- #ifndef _IAVF_REGISTER_H_
-diff --git a/drivers/common/iavf/iavf_status.h b/drivers/common/iavf/iavf_status.h
-index 33a98a25a9..f425638063 100644
---- a/drivers/common/iavf/iavf_status.h
-+++ b/drivers/common/iavf/iavf_status.h
+diff --git a/drivers/net/iavf/base/iavf_status.h b/drivers/net/iavf/base/iavf_status.h
+index cb91afb017..a981360af6 100644
+--- a/drivers/net/iavf/base/iavf_status.h
++++ b/drivers/net/iavf/base/iavf_status.h
 @@ -1,5 +1,5 @@
  /* SPDX-License-Identifier: BSD-3-Clause
-- * Copyright(c) 2001-2020
+- * Copyright(c) 2013 - 2015 Intel Corporation
 + * Copyright(c) 2001-2020 Intel Corporation
   */
  
  #ifndef _IAVF_STATUS_H_
-diff --git a/drivers/common/iavf/iavf_type.h b/drivers/common/iavf/iavf_type.h
-index 905e1afb63..665b070a0d 100644
---- a/drivers/common/iavf/iavf_type.h
-+++ b/drivers/common/iavf/iavf_type.h
-@@ -1,5 +1,5 @@
- /* SPDX-License-Identifier: BSD-3-Clause
-- * Copyright(c) 2001-2020
-+ * Copyright(c) 2001-2020 Intel Corporation
-  */
- 
- #ifndef _IAVF_TYPE_H_
-diff --git a/drivers/common/iavf/meson.build b/drivers/common/iavf/meson.build
-index ce50aceaf0..1f4d8b898d 100644
---- a/drivers/common/iavf/meson.build
-+++ b/drivers/common/iavf/meson.build
-@@ -1,5 +1,5 @@
- # SPDX-License-Identifier: BSD-3-Clause
--# Copyright(c) 2019 Intel Corporation
-+# Copyright(c) 2019-2020 Intel Corporation
- 
- sources = files('iavf_adminq.c', 'iavf_common.c', 'iavf_impl.c')
- 
-diff --git a/drivers/common/iavf/virtchnl.h b/drivers/common/iavf/virtchnl.h
-index ef41a4f8ac..79515ee8bd 100644
---- a/drivers/common/iavf/virtchnl.h
-+++ b/drivers/common/iavf/virtchnl.h
+diff --git a/drivers/net/iavf/base/virtchnl.h b/drivers/net/iavf/base/virtchnl.h
+index 50f7c8e49e..fa98417b05 100644
+--- a/drivers/net/iavf/base/virtchnl.h
++++ b/drivers/net/iavf/base/virtchnl.h
 @@ -1,5 +1,5 @@
  /* SPDX-License-Identifier: BSD-3-Clause
-- * Copyright(c) 2001-2020
+- * Copyright(c) 2013 - 2015 Intel Corporation
 + * Copyright(c) 2001-2020 Intel Corporation
   */