[dpdk-stable] patch 'drivers: fix SPDX license id consistency' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

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/01/19. 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.

Queued patches can be viewed on the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
>From 5f73fcf125e6a8fadf188674214e7eeee8ed065e Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen at networkplumber.org>
Date: Wed, 6 Feb 2019 14:27:57 -0800
Subject: [PATCH] drivers: fix SPDX license id consistency

[ upstream commit c6b571574636be15faccae52b55910ed30f52746 ]

All drivers should have SPDX on the first line of the source
files in the format
  /* SPDX-License-Identifier: ...

Several files used minor modifications which were inconsistent
with the pattern. Fix it to make scanning tools easier.

Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
---
 drivers/bus/fslmc/qbman/include/fsl_qbman_debug.h | 6 +++---
 drivers/bus/fslmc/qbman/qbman_debug.c             | 5 ++---
 drivers/crypto/dpaa2_sec/hw/desc/pdcp.h           | 4 +---
 drivers/event/dpaa2/dpaa2_eventdev.h              | 7 ++-----
 drivers/event/dpaa2/dpaa2_eventdev_logs.h         | 3 +--
 drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h     | 3 +--
 drivers/net/dpaa2/dpaa2_pmd_logs.h                | 3 +--
 drivers/net/mvpp2/mrvl_mtr.c                      | 3 +--
 8 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/drivers/bus/fslmc/qbman/include/fsl_qbman_debug.h b/drivers/bus/fslmc/qbman/include/fsl_qbman_debug.h
index 072ad551c..e010b1b6a 100644
--- a/drivers/bus/fslmc/qbman/include/fsl_qbman_debug.h
+++ b/drivers/bus/fslmc/qbman/include/fsl_qbman_debug.h
@@ -1,6 +1,6 @@
-/* Copyright (C) 2015 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:        BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2015 Freescale Semiconductor, Inc.
  */
+
 struct qbman_swp;
 
diff --git a/drivers/bus/fslmc/qbman/qbman_debug.c b/drivers/bus/fslmc/qbman/qbman_debug.c
index 591673abc..0bb2ce880 100644
--- a/drivers/bus/fslmc/qbman/qbman_debug.c
+++ b/drivers/bus/fslmc/qbman/qbman_debug.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 2015 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:        BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2015 Freescale Semiconductor, Inc.
  */
 
diff --git a/drivers/crypto/dpaa2_sec/hw/desc/pdcp.h b/drivers/crypto/dpaa2_sec/hw/desc/pdcp.h
index 719ef605f..fee844100 100644
--- a/drivers/crypto/dpaa2_sec/hw/desc/pdcp.h
+++ b/drivers/crypto/dpaa2_sec/hw/desc/pdcp.h
@@ -1,6 +1,4 @@
-/*
+/* SPDX-License-Identifier: BSD-3-Clause or GPL-2.0+
  * Copyright 2008-2013 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: BSD-3-Clause or GPL-2.0+
  */
 
diff --git a/drivers/event/dpaa2/dpaa2_eventdev.h b/drivers/event/dpaa2/dpaa2_eventdev.h
index c847b3eab..bdac1aa56 100644
--- a/drivers/event/dpaa2/dpaa2_eventdev.h
+++ b/drivers/event/dpaa2/dpaa2_eventdev.h
@@ -1,7 +1,4 @@
-/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
- *   Copyright 2017 NXP
- *
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2017 NXP
  */
 
diff --git a/drivers/event/dpaa2/dpaa2_eventdev_logs.h b/drivers/event/dpaa2/dpaa2_eventdev_logs.h
index a2c2060cf..86f2e5393 100644
--- a/drivers/event/dpaa2/dpaa2_eventdev_logs.h
+++ b/drivers/event/dpaa2/dpaa2_eventdev_logs.h
@@ -1,4 +1,3 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
  * Copyright 2018 NXP
  */
diff --git a/drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h b/drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h
index c79b3d1cf..986264319 100644
--- a/drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h
+++ b/drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h
@@ -1,4 +1,3 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
  * Copyright 2017 NXP
  */
diff --git a/drivers/net/dpaa2/dpaa2_pmd_logs.h b/drivers/net/dpaa2/dpaa2_pmd_logs.h
index c04babdb4..c47ba8e10 100644
--- a/drivers/net/dpaa2/dpaa2_pmd_logs.h
+++ b/drivers/net/dpaa2/dpaa2_pmd_logs.h
@@ -1,4 +1,3 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
  * Copyright 2017 NXP
  */
diff --git a/drivers/net/mvpp2/mrvl_mtr.c b/drivers/net/mvpp2/mrvl_mtr.c
index 9adcd9751..39272acea 100644
--- a/drivers/net/mvpp2/mrvl_mtr.c
+++ b/drivers/net/mvpp2/mrvl_mtr.c
@@ -1,4 +1,3 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
  * Copyright(c) 2018 Marvell International Ltd.
  * Copyright(c) 2018 Semihalf.
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:46.820654426 +0100
+++ 0001-drivers-fix-SPDX-license-id-consistency.patch	2019-04-25 16:37:46.677296505 +0100
@@ -1 +1 @@
-From c6b571574636be15faccae52b55910ed30f52746 Mon Sep 17 00:00:00 2001
+From 5f73fcf125e6a8fadf188674214e7eeee8ed065e Mon Sep 17 00:00:00 2001
@@ -4,0 +5,2 @@
+
+[ upstream commit c6b571574636be15faccae52b55910ed30f52746 ]