Skip to contentSkip to conversation

iommu/exynos: convert to SPDX license tags

PATCH Superseded Yangtao Li 8 participants 20 messages Jun 13, 2019 – Jun 14, 2019

Subsystems (9)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Yangtao Li

author
#0 lore raw

PATCH 1/10 iommu/exynos: convert to SPDX license tags

Updates license to use SPDX-License-Identifier.

---
 drivers/iommu/exynos-iommu.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/iommu/exynos-iommu.c +1 -4
index 05c6bc099d62..938a33d2f89d 100644
@@ -1,10 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2011,2016 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #ifdef CONFIG_EXYNOS_IOMMU_DEBUG
Signature · 1 line
2.17.0
author
#1 lore raw

PATCH 2/10 iommu/io-pgtable: convert to SPDX license tags

Updates license to use SPDX-License-Identifier.

---
 drivers/iommu/io-pgtable.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)
drivers/iommu/io-pgtable.c +1 -12
index 5227cfdbb65b..3c84ff1901ea 100644
@@ -1,18 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Generic page table allocator for IOMMUs.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  * Copyright (C) 2014 ARM Limited
  *
  * Author: Will Deacon <[email protected]>
Signature · 1 line
2.17.0
author
#3 lore raw

PATCH 3/10 iommu/omap: convert to SPDX license tags

In reply to Yangtao Li

Updates license to use SPDX-License-Identifier.

---
 drivers/iommu/omap-iommu-debug.c | 5 +----
 drivers/iommu/omap-iommu.c       | 5 +----
 drivers/iommu/omap-iommu.h       | 5 +----
 drivers/iommu/omap-iopgtable.h   | 5 +----
 4 files changed, 4 insertions(+), 16 deletions(-)
drivers/iommu/omap-iommu-debug.c +1 -4
index 4abc0ef522a8..55ec67a45101 100644
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * omap iommu: debugfs interface
  *
  * Copyright (C) 2008-2009 Nokia Corporation
  *
  * Written by Hiroshi DOYU <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #include <linux/err.h>
drivers/iommu/omap-iommu.c +1 -4
index d2fb347aa4ff..e6442876913f 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * omap iommu: tlb and pagetable primitives
  *
@@ -6,10 +7,6 @@
  *
  * Written by Hiroshi DOYU <[email protected]>,
  *		Paul Mundt and Toshihiro Kobayashi
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #include <linux/dma-mapping.h>
drivers/iommu/omap-iommu.h +1 -4
index 1703159ef5af..5256e17d86a7 100644
@@ -1,13 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * omap iommu: main structures
  *
  * Copyright (C) 2008-2009 Nokia Corporation
  *
  * Written by Hiroshi DOYU <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #ifndef _OMAP_IOMMU_H
drivers/iommu/omap-iopgtable.h +1 -4
index 01a315227bf0..871c2a38f453 100644
@@ -1,13 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * omap iommu: pagetable definitions
  *
  * Copyright (C) 2008-2010 Nokia Corporation
  *
  * Written by Hiroshi DOYU <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #ifndef _OMAP_IOPGTABLE_H
Signature · 1 line
2.17.0
Acked-by on v1 3/10
#4 lore raw

Re: [PATCH 03/10] iommu/omap: convert to SPDX license tags

Hi Yangtao,

Quoted 3 lines · Yangtao Li

Updates license to use SPDX-License-Identifier.

Thanks for the patch. Can you also update another related file while at this. Will leave it to Joerg if he prefers it as a separate patch, or folded into this patch.

include/linux/platform_data/iommu-omap.h

regards
Suman

Quoted 85 lines
---
 drivers/iommu/omap-iommu-debug.c | 5 +----
 drivers/iommu/omap-iommu.c       | 5 +----
 drivers/iommu/omap-iommu.h       | 5 +----
 drivers/iommu/omap-iopgtable.h   | 5 +----
 4 files changed, 4 insertions(+), 16 deletions(-)
drivers/iommu/omap-iommu-debug.c +1 -4
index 4abc0ef522a8..55ec67a45101 100644
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * omap iommu: debugfs interface
  *
  * Copyright (C) 2008-2009 Nokia Corporation
  *
  * Written by Hiroshi DOYU <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #include <linux/err.h>
drivers/iommu/omap-iommu.c +1 -4
index d2fb347aa4ff..e6442876913f 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * omap iommu: tlb and pagetable primitives
  *
@@ -6,10 +7,6 @@
  *
  * Written by Hiroshi DOYU <[email protected]>,
  *		Paul Mundt and Toshihiro Kobayashi
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #include <linux/dma-mapping.h>
drivers/iommu/omap-iommu.h +1 -4
index 1703159ef5af..5256e17d86a7 100644
@@ -1,13 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * omap iommu: main structures
  *
  * Copyright (C) 2008-2009 Nokia Corporation
  *
  * Written by Hiroshi DOYU <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #ifndef _OMAP_IOMMU_H
drivers/iommu/omap-iopgtable.h +1 -4
index 01a315227bf0..871c2a38f453 100644
@@ -1,13 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * omap iommu: pagetable definitions
  *
  * Copyright (C) 2008-2010 Nokia Corporation
  *
  * Written by Hiroshi DOYU <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #ifndef _OMAP_IOPGTABLE_H
author
#5 lore raw

Re: [PATCH 03/10] iommu/omap: convert to SPDX license tags

Quoted 6 lines · Suman Anna

Hi Yangtao,

Quoted 2 lines · Yangtao Li

Updates license to use SPDX-License-Identifier.

Quoted 8 lines
Quoted 1 line

Thanks for the patch. Can you also update another related file while at this. Will leave it to Joerg if he prefers it as a separate patch, or folded into this patch.

include/linux/platform_data/iommu-omap.h

Done.

Yangtao

Quoted 91 lines

regards
Suman

Quoted 85 lines
---
 drivers/iommu/omap-iommu-debug.c | 5 +----
 drivers/iommu/omap-iommu.c       | 5 +----
 drivers/iommu/omap-iommu.h       | 5 +----
 drivers/iommu/omap-iopgtable.h   | 5 +----
 4 files changed, 4 insertions(+), 16 deletions(-)
drivers/iommu/omap-iommu-debug.c +1 -4
index 4abc0ef522a8..55ec67a45101 100644
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * omap iommu: debugfs interface
  *
  * Copyright (C) 2008-2009 Nokia Corporation
  *
  * Written by Hiroshi DOYU <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #include <linux/err.h>
drivers/iommu/omap-iommu.c +1 -4
index d2fb347aa4ff..e6442876913f 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * omap iommu: tlb and pagetable primitives
  *
@@ -6,10 +7,6 @@
  *
  * Written by Hiroshi DOYU <[email protected]>,
  *           Paul Mundt and Toshihiro Kobayashi
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #include <linux/dma-mapping.h>
drivers/iommu/omap-iommu.h +1 -4
index 1703159ef5af..5256e17d86a7 100644
@@ -1,13 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * omap iommu: main structures
  *
  * Copyright (C) 2008-2009 Nokia Corporation
  *
  * Written by Hiroshi DOYU <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #ifndef _OMAP_IOMMU_H
drivers/iommu/omap-iopgtable.h +1 -4
index 01a315227bf0..871c2a38f453 100644
@@ -1,13 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * omap iommu: pagetable definitions
  *
  * Copyright (C) 2008-2010 Nokia Corporation
  *
  * Written by Hiroshi DOYU <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #ifndef _OMAP_IOPGTABLE_H
author
#6 lore raw

PATCH 4/10 iommu/qcom: convert to SPDX license tags

In reply to Yangtao Li

Updates license to use SPDX-License-Identifier.

---
 drivers/iommu/qcom_iommu.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)
drivers/iommu/qcom_iommu.c +1 -12
index 8cdd3f059513..ad913720d7dd 100644
@@ -1,18 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * IOMMU API for QCOM secure IOMMUs.  Somewhat based on arm-smmu.c
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  * Copyright (C) 2013 ARM Limited
  * Copyright (C) 2017 Red Hat
  */
Signature · 1 line
2.17.0
author
#7 lore raw

PATCH 5/10 iommu/dma-iommu: convert to SPDX license tags

In reply to Yangtao Li

Updates license to use SPDX-License-Identifier.

---
 drivers/iommu/dma-iommu.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)
drivers/iommu/dma-iommu.c +1 -12
index 129c4badf9ae..2d76bac43b82 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * A fairly generic DMA-API to IOMMU-API glue layer.
  *
@@ -5,18 +6,6 @@
  *
  * based in part on arch/arm/mm/dma-mapping.c:
  * Copyright (C) 2000-2004 Russell King
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <linux/acpi_iort.h>
Signature · 1 line
2.17.0
maintainer
#8 lore raw

Re: [PATCH 05/10] iommu/dma-iommu: convert to SPDX license tags

Quoted 1 line · Yangtao Li

Updates license to use SPDX-License-Identifier.

A more complete version of this (which also covers the header) is already queued in -next.

Robin.

Quoted 34 lines
---
  drivers/iommu/dma-iommu.c | 13 +------------
  1 file changed, 1 insertion(+), 12 deletions(-)
drivers/iommu/dma-iommu.c +1 -12
index 129c4badf9ae..2d76bac43b82 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
  /*
   * A fairly generic DMA-API to IOMMU-API glue layer.
   *
@@ -5,18 +6,6 @@
   *
   * based in part on arch/arm/mm/dma-mapping.c:
   * Copyright (C) 2000-2004 Russell King
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
 
  #include <linux/acpi_iort.h>
author
#9 lore raw

PATCH 6/10 iommu/io-pgtable-arm-v7s: convert to SPDX license tags

In reply to Yangtao Li

Updates license to use SPDX-License-Identifier.

---
 drivers/iommu/io-pgtable-arm-v7s.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)
drivers/iommu/io-pgtable-arm-v7s.c +1 -12
index 9a8a8870e267..fd0c8f2def45 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * CPU-agnostic ARM page table allocator.
  *
@@ -14,18 +15,6 @@
  * - PXN
  * - Domains
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  * Copyright (C) 2014-2015 ARM Limited
  * Copyright (c) 2014-2015 MediaTek Inc.
  */
Signature · 1 line
2.17.0
author
#10 lore raw

PATCH 7/10 iommu/io-pgtable-arm: convert to SPDX license tags

In reply to Yangtao Li

Updates license to use SPDX-License-Identifier.

---
 drivers/iommu/io-pgtable-arm.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)
drivers/iommu/io-pgtable-arm.c +1 -12
index 4e21efbc4459..6282c45eefaa 100644
@@ -1,18 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * CPU-agnostic ARM page table allocator.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  * Copyright (C) 2014 ARM Limited
  *
  * Author: Will Deacon <[email protected]>
Signature · 1 line
2.17.0
author
#12 lore raw

PATCH 8/10 iommu/sysfs: convert to SPDX license tags

In reply to Yangtao Li

Updates license to use SPDX-License-Identifier.

---
 drivers/iommu/iommu-sysfs.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/iommu/iommu-sysfs.c +1 -4
index 44127d54e943..a193758c8122 100644
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * IOMMU sysfs class support
  *
  * Copyright (C) 2014 Red Hat, Inc.  All rights reserved.
  *     Author: Alex Williamson <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #include <linux/device.h>
Signature · 1 line
2.17.0
author
#13 lore raw

PATCH 9/10 iommu/rockchip: convert to SPDX license tags

In reply to Yangtao Li

Updates license to use SPDX-License-Identifier.

---
 drivers/iommu/rockchip-iommu.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/iommu/rockchip-iommu.c +1 -4
index 77d4bd93fe4b..9c4c6eb7d42b 100644
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * IOMMU API for Rockchip
  *
  * Module Authors:	Simon Xue <[email protected]>
  *			Daniel Kurtz <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #include <linux/clk.h>
Signature · 1 line
2.17.0
author
#15 lore raw

PATCH 10/10 iommu/tegra-smmu: convert to SPDX license tags

In reply to Yangtao Li

Updates license to use SPDX-License-Identifier.

---
 drivers/iommu/tegra-smmu.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/iommu/tegra-smmu.c +1 -4
index 463ee08f7d3a..9a50ca4ec65c 100644
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2011-2014 NVIDIA CORPORATION.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #include <linux/bitops.h>
Signature · 1 line
2.17.0
#17 lore raw
In reply to Yangtao Li
Quoted 7 lines · Yangtao Li

Updates license to use SPDX-License-Identifier.

---
 drivers/iommu/exynos-iommu.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Splitting this per driver is too much... it is not necessary. Such changes should be done in one patch per subsystem.

Best regards,
Krzysztof

#18 lore raw
In reply to Yangtao Li

Thomas Gleixner is doing automated SPDX conversion that directly got to Linux at the moment. I'd avoid doing more manual ones for now as it will just create conflicts.

author
#19 lore raw

Need me to make them a patch?

MBR,
Yangtao