Home Home > GIT Browse > SLE15-SP1-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bogendoerfer <tbogendoerfer@suse.de>2019-06-19 18:03:06 +0200
committerThomas Bogendoerfer <tbogendoerfer@suse.de>2019-06-19 18:04:18 +0200
commit1fed59e611e2d58dbc7a9e9c623f3f4c78fb6a55 (patch)
treee2b0b77dcdaa4f1d75cab6500c5fc296320326b5
parent78365f26a9ac9ee12f42f5282e77e76409ddfe7b (diff)
platform/x86: mlx-platform: Convert to use SPDX identifier
(bsc#1112374).
-rw-r--r--patches.drivers/platform-x86-mlx-platform-Convert-to-use-SPDX-identi.patch57
-rw-r--r--series.conf1
2 files changed, 58 insertions, 0 deletions
diff --git a/patches.drivers/platform-x86-mlx-platform-Convert-to-use-SPDX-identi.patch b/patches.drivers/platform-x86-mlx-platform-Convert-to-use-SPDX-identi.patch
new file mode 100644
index 0000000000..77ea7f90d4
--- /dev/null
+++ b/patches.drivers/platform-x86-mlx-platform-Convert-to-use-SPDX-identi.patch
@@ -0,0 +1,57 @@
+From: Vadim Pasternak <vadimp@mellanox.com>
+Date: Thu, 15 Nov 2018 17:27:00 +0000
+Subject: platform/x86: mlx-platform: Convert to use SPDX identifier
+Patch-mainline: v5.0-rc1
+Git-commit: fb7255a923115188ac134bb562d1c44f4f3a413b
+References: bsc#1112374
+
+Reduce size of duplicated comments by switching to use SPDX identifier.
+
+Signed-off-by: Vadim Pasternak <vadimp@mellanox.com>
+Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
+Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
+---
+ drivers/platform/x86/mlx-platform.c | 33 ++++-----------------------------
+ 1 file changed, 4 insertions(+), 29 deletions(-)
+
+--- a/drivers/platform/x86/mlx-platform.c
++++ b/drivers/platform/x86/mlx-platform.c
+@@ -1,34 +1,9 @@
++// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0
+ /*
+- * Copyright (c) 2016 Mellanox Technologies. All rights reserved.
+- * Copyright (c) 2016 Vadim Pasternak <vadimp@mellanox.com>
++ * Mellanox platform driver
+ *
+- * Redistribution and use in source and binary forms, with or without
+- * modification, are permitted provided that the following conditions are met:
+- *
+- * 1. Redistributions of source code must retain the above copyright
+- * notice, this list of conditions and the following disclaimer.
+- * 2. Redistributions in binary form must reproduce the above copyright
+- * notice, this list of conditions and the following disclaimer in the
+- * documentation and/or other materials provided with the distribution.
+- * 3. Neither the names of the copyright holders nor the names of its
+- * contributors may be used to endorse or promote products derived from
+- * this software without specific prior written permission.
+- *
+- * Alternatively, this software may be distributed under the terms of the
+- * GNU General Public License ("GPL") version 2 as published by the Free
+- * Software Foundation.
+- *
+- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+- * POSSIBILITY OF SUCH DAMAGE.
++ * Copyright (C) 2016-2018 Mellanox Technologies
++ * Copyright (C) 2016-2018 Vadim Pasternak <vadimp@mellanox.com>
+ */
+
+ #include <linux/device.h>
diff --git a/series.conf b/series.conf
index e71fff2a49..3e222fcac4 100644
--- a/series.conf
+++ b/series.conf
@@ -43277,6 +43277,7 @@
patches.drivers/platform-x86-mlx-platform-Fix-tachometer-registers.patch
patches.drivers/platform-x86-mlx-platform-Fix-LED-configuration.patch
patches.drivers/platform-x86-mlx-platform-Allow-mlxreg-io-driver-act-e2883859.patch
+ patches.drivers/platform-x86-mlx-platform-Convert-to-use-SPDX-identi.patch
patches.drm/0049-drm-v3d-Fix-a-use-after-free-race-accessing-the-sche.patch
patches.drm/0050-drm-v3d-Skip-debugfs-dumping-GCA-on-platforms-withou.patch
patches.drm/0001-drm-rockchip-psr-do-not-dereference-encoder-before-i.patch