Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-02-15 10:23:48 +0100
committerJiri Slaby <jslaby@suse.cz>2019-02-15 10:24:11 +0100
commit4cff4a72567f08c096c0f4c928ff99d9ce5d1d5b (patch)
treefeea479d111a8a0efd756653567d559386b0c7bb
parent2317378194983572ec5368409d5a8a7568f4f64e (diff)
drm/rockchip: rgb: update SPDX license identifier (bnc#1012628).
-rw-r--r--patches.kernel.org/4.20.9-038-drm-rockchip-rgb-update-SPDX-license-identifie.patch76
-rw-r--r--series.conf1
2 files changed, 77 insertions, 0 deletions
diff --git a/patches.kernel.org/4.20.9-038-drm-rockchip-rgb-update-SPDX-license-identifie.patch b/patches.kernel.org/4.20.9-038-drm-rockchip-rgb-update-SPDX-license-identifie.patch
new file mode 100644
index 0000000000..b70b45fe22
--- /dev/null
+++ b/patches.kernel.org/4.20.9-038-drm-rockchip-rgb-update-SPDX-license-identifie.patch
@@ -0,0 +1,76 @@
+From: Sandy Huang <hjc@rock-chips.com>
+Date: Wed, 23 Jan 2019 18:14:39 +0800
+Subject: [PATCH] drm/rockchip: rgb: update SPDX license identifier
+References: bnc#1012628
+Patch-mainline: 4.20.9
+Git-commit: 053ff09f1a8f2151339f9fda457c5250929d1c49
+
+commit 053ff09f1a8f2151339f9fda457c5250929d1c49 upstream.
+
+Update SPDX License Identifier from GPL-2.0+ to GPL-2.0
+and drop some GPL text.
+This fixes a mismatch between the existing SPDX headers and GPL
+boilerplate text.
+
+Fixes: 1f0f01515172 ("Add support for Rockchip Soc RGB output interface")
+Cc: stable@vger.kernel.org
+Reported-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Sandy Huang <hjc@rock-chips.com>
+Signed-off-by: Heiko Stuebner <heiko@sntech.de>
+Link: https://patchwork.freedesktop.org/patch/msgid/1548238479-171491-1-git-send-email-hjc@rock-chips.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ drivers/gpu/drm/rockchip/rockchip_rgb.c | 11 +----------
+ drivers/gpu/drm/rockchip/rockchip_rgb.h | 11 +----------
+ 2 files changed, 2 insertions(+), 20 deletions(-)
+
+diff --git a/drivers/gpu/drm/rockchip/rockchip_rgb.c b/drivers/gpu/drm/rockchip/rockchip_rgb.c
+index 37f93022a106..c0351abf83a3 100644
+--- a/drivers/gpu/drm/rockchip/rockchip_rgb.c
++++ b/drivers/gpu/drm/rockchip/rockchip_rgb.c
+@@ -1,17 +1,8 @@
+-//SPDX-License-Identifier: GPL-2.0+
++// SPDX-License-Identifier: GPL-2.0
+ /*
+ * Copyright (C) Fuzhou Rockchip Electronics Co.Ltd
+ * Author:
+ * Sandy Huang <hjc@rock-chips.com>
+- *
+- * This software is licensed under the terms of the GNU General Public
+- * License version 2, as published by the Free Software Foundation, and
+- * may be copied, distributed, and modified under those terms.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- * GNU General Public License for more details.
+ */
+
+ #include <drm/drmP.h>
+diff --git a/drivers/gpu/drm/rockchip/rockchip_rgb.h b/drivers/gpu/drm/rockchip/rockchip_rgb.h
+index 38b52e63b2b0..27b9635124bc 100644
+--- a/drivers/gpu/drm/rockchip/rockchip_rgb.h
++++ b/drivers/gpu/drm/rockchip/rockchip_rgb.h
+@@ -1,17 +1,8 @@
+-//SPDX-License-Identifier: GPL-2.0+
++/* SPDX-License-Identifier: GPL-2.0 */
+ /*
+ * Copyright (C) Fuzhou Rockchip Electronics Co.Ltd
+ * Author:
+ * Sandy Huang <hjc@rock-chips.com>
+- *
+- * This software is licensed under the terms of the GNU General Public
+- * License version 2, as published by the Free Software Foundation, and
+- * may be copied, distributed, and modified under those terms.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- * GNU General Public License for more details.
+ */
+
+ #ifdef CONFIG_ROCKCHIP_RGB
+--
+2.20.1
+
diff --git a/series.conf b/series.conf
index 12000bad4d..14e6c2484c 100644
--- a/series.conf
+++ b/series.conf
@@ -1120,6 +1120,7 @@
patches.kernel.org/4.20.9-035-mic-vop-Fix-use-after-free-on-remove.patch
patches.kernel.org/4.20.9-036-mac80211-ensure-that-mgmt-tx-skbs-have-tailroo.patch
patches.kernel.org/4.20.9-037-drm-modes-Prevent-division-by-zero-htotal.patch
+ patches.kernel.org/4.20.9-038-drm-rockchip-rgb-update-SPDX-license-identifie.patch
########################################################
# Build fixes that apply to the vanilla kernel too.