Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: android: Clean up license identifiers

Add the identifiers when missing and fix the ones already present
according to checkpatch.pl.

Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Nathan Chancellor and committed by
Greg Kroah-Hartman
a81403c4 0b694219

+4 -29
+1 -5
drivers/staging/android/ashmem.h
··· 1 - // SPDX-License-Identifier: (GPL-2.0 OR Apache-2.0) 1 + /* SPDX-License-Identifier: GPL-2.0 OR Apache-2.0 */ 2 2 /* 3 3 * include/linux/ashmem.h 4 4 * 5 5 * Copyright 2008 Google Inc. 6 6 * Author: Robert Love 7 - * 8 - * This file is dual licensed. It may be redistributed and/or modified 9 - * under the terms of the Apache 2.0 License OR version 2 of the GNU 10 - * General Public License. 11 7 */ 12 8 13 9 #ifndef _LINUX_ASHMEM_H
+1 -5
drivers/staging/android/uapi/ashmem.h
··· 1 - // SPDX-License-Identifier: (GPL-2.0 OR Apache-2.0) 1 + /* SPDX-License-Identifier: GPL-2.0 OR Apache-2.0 */ 2 2 /* 3 3 * drivers/staging/android/uapi/ashmem.h 4 4 * 5 5 * Copyright 2008 Google Inc. 6 6 * Author: Robert Love 7 - * 8 - * This file is dual licensed. It may be redistributed and/or modified 9 - * under the terms of the Apache 2.0 License OR version 2 of the GNU 10 - * General Public License. 11 7 */ 12 8 13 9 #ifndef _UAPI_LINUX_ASHMEM_H
+1 -9
drivers/staging/android/uapi/vsoc_shm.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Copyright (C) 2017 Google, Inc. 3 - * 4 - * This software is licensed under the terms of the GNU General Public 5 - * License version 2, as published by the Free Software Foundation, and 6 - * may be copied, distributed, and modified under those terms. 7 - * 8 - * This program is distributed in the hope that it will be useful, 9 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 - * GNU General Public License for more details. 12 4 * 13 5 */ 14 6
+1 -10
drivers/staging/android/vsoc.c
··· 1 + // SPDX-License-Identifier: GPL-2.0 1 2 /* 2 3 * drivers/android/staging/vsoc.c 3 4 * ··· 7 6 * Copyright (C) 2017 Google, Inc. 8 7 * 9 8 * Author: ghartman@google.com 10 - * 11 - * This software is licensed under the terms of the GNU General Public 12 - * License version 2, as published by the Free Software Foundation, and 13 - * may be copied, distributed, and modified under those terms. 14 - * 15 - * This program is distributed in the hope that it will be useful, 16 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 17 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 18 - * GNU General Public License for more details. 19 - * 20 9 * 21 10 * Based on drivers/char/kvm_ivshmem.c - driver for KVM Inter-VM shared memory 22 11 * Copyright 2009 Cam Macdonell <cam@cs.ualberta.ca>