Re: [PATCH 2/7] include/(uapi/)media: add SPDX license info
On 14/02/18 19:12, Mauro Carvalho Chehab wrote: > Em Wed, 7 Feb 2018 15:39:34 +0100 > Hans Verkuil escreveu: > >> From: Hans Verkuil >> >> Replace the old license information with the corresponding SPDX >> license for those headers that I authored. >> >> Signed-off-by: Hans Verkuil > > ... > >> diff --git a/include/uapi/linux/cec.h b/include/uapi/linux/cec.h >> index b51fbe1941a7..20fe091b7e96 100644 >> --- a/include/uapi/linux/cec.h >> +++ b/include/uapi/linux/cec.h >> @@ -3,35 +3,6 @@ >> * cec - HDMI Consumer Electronics Control public header >> * >> * Copyright 2016 Cisco Systems, Inc. and/or its affiliates. All rights >> reserved. >> - * >> - * This program is free software; you may redistribute it and/or modify >> - * it under the terms of the GNU General Public License as published by >> - * the Free Software Foundation; version 2 of the License. >> - * >> - * Alternatively you can redistribute this file under the terms of the >> - * BSD license as stated below: >> - * >> - * 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. The names of its contributors may not be used to endorse or promote >> - *products derived from this software without specific prior written >> - *permission. >> - * >> - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, >> - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF >> - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND >> - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS >> - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN >> - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN >> - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE >> - * SOFTWARE. >> */ > > You forgot to add an SPDX licence for this file. There is one already. It appears that someone went through all the uapi headers and added SPDX licenses. I just removed the now unnecessary boilerplate text. I admit, it's not clear from the diff :-) just two more context lines at the start and you'd have seen it. Regards, Hans
Re: [PATCH 2/7] include/(uapi/)media: add SPDX license info
Em Wed, 7 Feb 2018 15:39:34 +0100 Hans Verkuil escreveu: > From: Hans Verkuil > > Replace the old license information with the corresponding SPDX > license for those headers that I authored. > > Signed-off-by: Hans Verkuil ... > diff --git a/include/uapi/linux/cec.h b/include/uapi/linux/cec.h > index b51fbe1941a7..20fe091b7e96 100644 > --- a/include/uapi/linux/cec.h > +++ b/include/uapi/linux/cec.h > @@ -3,35 +3,6 @@ > * cec - HDMI Consumer Electronics Control public header > * > * Copyright 2016 Cisco Systems, Inc. and/or its affiliates. All rights > reserved. > - * > - * This program is free software; you may redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; version 2 of the License. > - * > - * Alternatively you can redistribute this file under the terms of the > - * BSD license as stated below: > - * > - * 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. The names of its contributors may not be used to endorse or promote > - *products derived from this software without specific prior written > - *permission. > - * > - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, > - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF > - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS > - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN > - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN > - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE > - * SOFTWARE. > */ You forgot to add an SPDX licence for this file. Thanks, Mauro
[PATCH 2/7] include/(uapi/)media: add SPDX license info
From: Hans Verkuil Replace the old license information with the corresponding SPDX license for those headers that I authored. Signed-off-by: Hans Verkuil --- include/media/cec-notifier.h| 14 +- include/media/cec-pin.h | 14 +- include/media/cec.h | 14 +- include/media/i2c/ad9389b.h | 14 +- include/media/i2c/adv7511.h | 14 +- include/media/i2c/adv7604.h | 15 +-- include/media/i2c/adv7842.h | 15 +-- include/media/i2c/tc358743.h| 18 ++ include/media/i2c/ths7303.h | 10 +- include/media/i2c/uda1342.h | 15 +-- include/media/tpg/v4l2-tpg.h| 14 +- include/media/v4l2-dv-timings.h | 15 +-- include/media/v4l2-rect.h | 14 +- include/uapi/linux/cec-funcs.h | 29 - include/uapi/linux/cec.h| 29 - 15 files changed, 14 insertions(+), 230 deletions(-) diff --git a/include/media/cec-notifier.h b/include/media/cec-notifier.h index 57ec319a7f44..cf0add70b0e7 100644 --- a/include/media/cec-notifier.h +++ b/include/media/cec-notifier.h @@ -1,21 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * cec-notifier.h - notify CEC drivers of physical address changes * * Copyright 2016 Russell King * Copyright 2016-2017 Cisco Systems, Inc. and/or its affiliates. All rights reserved. - * - * This program is free software; you may redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. */ #ifndef LINUX_CEC_NOTIFIER_H diff --git a/include/media/cec-pin.h b/include/media/cec-pin.h index 83b3e17e0a07..ed16c6dde0ba 100644 --- a/include/media/cec-pin.h +++ b/include/media/cec-pin.h @@ -1,20 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * cec-pin.h - low-level CEC pin control * * Copyright 2017 Cisco Systems, Inc. and/or its affiliates. All rights reserved. - * - * This program is free software; you may redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. */ #ifndef LINUX_CEC_PIN_H diff --git a/include/media/cec.h b/include/media/cec.h index 7cdf71d7125a..9afba9b558df 100644 --- a/include/media/cec.h +++ b/include/media/cec.h @@ -1,20 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * cec - HDMI Consumer Electronics Control support header * * Copyright 2016 Cisco Systems, Inc. and/or its affiliates. All rights reserved. - * - * This program is free software; you may redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. */ #ifndef _MEDIA_CEC_H diff --git a/include/media/i2c/ad9389b.h b/include/media/i2c/ad9389b.h index 5ba9af869b8b..30f9ea9a1273 100644 --- a/include/media/i2c/ad9389b.h +++ b/include/media/i2c/ad9389b.h @@ -1,20 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Analog Devices AD9389B/AD9889B video encoder driver header * * Copyright 2012 Cisco Systems, Inc. and/or its affiliates. All rights reserved. - * - * This program is free software; you may redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foun
