[PATCH 6/9] staging: android: add SPDX identifiers to all android driver files

Laura Abbott labbott at redhat.com
Wed Nov 8 19:37:41 UTC 2017


On 11/07/2017 12:07 PM, Greg Kroah-Hartman wrote:
> It's good to have SPDX identifiers in all files to make it easier to
> audit the kernel tree for correct licenses.
> 
> Update the android driver files with the correct SPDX license identifier
> based on the license text in the file itself.  The SPDX identifier is a
> legally binding shorthand, which can be used instead of the full boiler
> plate text.
> 
> This work is based on a script and data from Thomas Gleixner, Philippe
> Ombredanne, and Kate Stewart.
> 

For the Ion parts,

Acked-by: Laura Abbott <labbott at redhat.com>

> Cc: "Arve Hjønnevåg" <arve at android.com>
> Cc: Riley Andrews <riandrews at android.com>
> Cc: Laura Abbott <labbott at redhat.com>
> Cc: Sumit Semwal <sumit.semwal at linaro.org>
> Cc: Thomas Gleixner <tglx at linutronix.de>
> Cc: Kate Stewart <kstewart at linuxfoundation.org>
> Cc: Philippe Ombredanne <pombredanne at nexb.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
> ---
>   drivers/staging/android/ashmem.c                | 1 +
>   drivers/staging/android/ashmem.h                | 1 +
>   drivers/staging/android/ion/ion-ioctl.c         | 1 +
>   drivers/staging/android/ion/ion.c               | 1 +
>   drivers/staging/android/ion/ion.h               | 1 +
>   drivers/staging/android/ion/ion_carveout_heap.c | 1 +
>   drivers/staging/android/ion/ion_chunk_heap.c    | 1 +
>   drivers/staging/android/ion/ion_cma_heap.c      | 1 +
>   drivers/staging/android/ion/ion_heap.c          | 1 +
>   drivers/staging/android/ion/ion_page_pool.c     | 1 +
>   drivers/staging/android/ion/ion_system_heap.c   | 1 +
>   drivers/staging/android/uapi/ashmem.h           | 1 +
>   drivers/staging/android/uapi/ion.h              | 1 +
>   13 files changed, 13 insertions(+)
> 
> diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c
> index 0f695df14c9d..24298077a3ba 100644
> --- a/drivers/staging/android/ashmem.c
> +++ b/drivers/staging/android/ashmem.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
>   /* mm/ashmem.c
>    *
>    * Anonymous Shared Memory Subsystem, ashmem
> diff --git a/drivers/staging/android/ashmem.h b/drivers/staging/android/ashmem.h
> index 5abcfd7aa706..60d7208f110a 100644
> --- a/drivers/staging/android/ashmem.h
> +++ b/drivers/staging/android/ashmem.h
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: (GPL-2.0 OR Apache-2.0)
>   /*
>    * include/linux/ashmem.h
>    *
> diff --git a/drivers/staging/android/ion/ion-ioctl.c b/drivers/staging/android/ion/ion-ioctl.c
> index c78989351f9c..4eda17713d82 100644
> --- a/drivers/staging/android/ion/ion-ioctl.c
> +++ b/drivers/staging/android/ion/ion-ioctl.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
>   /*
>    *
>    * Copyright (C) 2011 Google, Inc.
> diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
> index a7d9b0e98572..eac43db27b60 100644
> --- a/drivers/staging/android/ion/ion.c
> +++ b/drivers/staging/android/ion/ion.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
>   /*
>    *
>    * drivers/staging/android/ion/ion.c
> diff --git a/drivers/staging/android/ion/ion.h b/drivers/staging/android/ion/ion.h
> index f5f9cd63f8e9..3e9327625426 100644
> --- a/drivers/staging/android/ion/ion.h
> +++ b/drivers/staging/android/ion/ion.h
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
>   /*
>    * drivers/staging/android/ion/ion.h
>    *
> diff --git a/drivers/staging/android/ion/ion_carveout_heap.c b/drivers/staging/android/ion/ion_carveout_heap.c
> index fee7650d6fbb..ff1345d81564 100644
> --- a/drivers/staging/android/ion/ion_carveout_heap.c
> +++ b/drivers/staging/android/ion/ion_carveout_heap.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
>   /*
>    * drivers/staging/android/ion/ion_carveout_heap.c
>    *
> diff --git a/drivers/staging/android/ion/ion_chunk_heap.c b/drivers/staging/android/ion/ion_chunk_heap.c
> index 102c09398317..b23694f6bf7f 100644
> --- a/drivers/staging/android/ion/ion_chunk_heap.c
> +++ b/drivers/staging/android/ion/ion_chunk_heap.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
>   /*
>    * drivers/staging/android/ion/ion_chunk_heap.c
>    *
> diff --git a/drivers/staging/android/ion/ion_cma_heap.c b/drivers/staging/android/ion/ion_cma_heap.c
> index dd5545d9990a..6f6b1e208ec5 100644
> --- a/drivers/staging/android/ion/ion_cma_heap.c
> +++ b/drivers/staging/android/ion/ion_cma_heap.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
>   /*
>    * drivers/staging/android/ion/ion_cma_heap.c
>    *
> diff --git a/drivers/staging/android/ion/ion_heap.c b/drivers/staging/android/ion/ion_heap.c
> index 91faa7f035b9..97344eba611c 100644
> --- a/drivers/staging/android/ion/ion_heap.c
> +++ b/drivers/staging/android/ion/ion_heap.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
>   /*
>    * drivers/staging/android/ion/ion_heap.c
>    *
> diff --git a/drivers/staging/android/ion/ion_page_pool.c b/drivers/staging/android/ion/ion_page_pool.c
> index 817849df9de3..4c63e8f25b3f 100644
> --- a/drivers/staging/android/ion/ion_page_pool.c
> +++ b/drivers/staging/android/ion/ion_page_pool.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
>   /*
>    * drivers/staging/android/ion/ion_mem_pool.c
>    *
> diff --git a/drivers/staging/android/ion/ion_system_heap.c b/drivers/staging/android/ion/ion_system_heap.c
> index 4dc5d7a589c2..9ff940095e3b 100644
> --- a/drivers/staging/android/ion/ion_system_heap.c
> +++ b/drivers/staging/android/ion/ion_system_heap.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
>   /*
>    * drivers/staging/android/ion/ion_system_heap.c
>    *
> diff --git a/drivers/staging/android/uapi/ashmem.h b/drivers/staging/android/uapi/ashmem.h
> index 13df42d200b7..5b531af6820e 100644
> --- a/drivers/staging/android/uapi/ashmem.h
> +++ b/drivers/staging/android/uapi/ashmem.h
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: (GPL-2.0 OR Apache-2.0)
>   /*
>    * drivers/staging/android/uapi/ashmem.h
>    *
> diff --git a/drivers/staging/android/uapi/ion.h b/drivers/staging/android/uapi/ion.h
> index 9e21451149d0..63ae80f658dc 100644
> --- a/drivers/staging/android/uapi/ion.h
> +++ b/drivers/staging/android/uapi/ion.h
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
>   /*
>    * drivers/staging/android/uapi/ion.h
>    *
> 



More information about the devel mailing list