| Message ID | 20180506231626.115996-8-dirk@hohndel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 05/07/2018 01:16 AM, Dirk Hohndel (VMware) wrote: > These files are licensed under GPL-2.0. > Removing the MIT boilerplate as that really didn't make any sense for > those two header files. > > Signed-off-by: Dirk Hohndel (VMware) <dirk@hohndel.org> > --- > drivers/gpu/drm/vmwgfx/Kconfig | 1 + > .../vmwgfx/device_include/vmware_pack_begin.h | 25 +------------------ > .../vmwgfx/device_include/vmware_pack_end.h | 25 +------------------ > 3 files changed, 3 insertions(+), 48 deletions(-) > > diff --git a/drivers/gpu/drm/vmwgfx/Kconfig b/drivers/gpu/drm/vmwgfx/Kconfig > index 8c308dac99c5..6b28a326f8bb 100644 > --- a/drivers/gpu/drm/vmwgfx/Kconfig > +++ b/drivers/gpu/drm/vmwgfx/Kconfig > @@ -1,3 +1,4 @@ > +# SPDX-License-Identifier: GPL-2.0 > config DRM_VMWGFX > tristate "DRM driver for VMware Virtual GPU" > depends on DRM && PCI && X86 && MMU > diff --git a/drivers/gpu/drm/vmwgfx/device_include/vmware_pack_begin.h b/drivers/gpu/drm/vmwgfx/device_include/vmware_pack_begin.h > index 7e7b0ce34aa2..75308bd0d970 100644 > --- a/drivers/gpu/drm/vmwgfx/device_include/vmware_pack_begin.h > +++ b/drivers/gpu/drm/vmwgfx/device_include/vmware_pack_begin.h > @@ -1,25 +1,2 @@ > -/********************************************************** > - * Copyright 2015 VMware, Inc. All rights reserved. > - * > - * Permission is hereby granted, free of charge, to any person > - * obtaining a copy of this software and associated documentation > - * files (the "Software"), to deal in the Software without > - * restriction, including without limitation the rights to use, copy, > - * modify, merge, publish, distribute, sublicense, and/or sell copies > - * of the Software, and to permit persons to whom the Software is > - * furnished to do so, subject to the following conditions: > - * > - * The above copyright notice and this permission notice shall be > - * included in all copies or substantial portions of the Software. > - * > - * 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. > - * > - **********************************************************/ > +/* SPDX-License-Identifier: GPL-2.0 */ > #include <linux/compiler.h> > diff --git a/drivers/gpu/drm/vmwgfx/device_include/vmware_pack_end.h b/drivers/gpu/drm/vmwgfx/device_include/vmware_pack_end.h > index e2e440ed3d44..e93d6f28b68c 100644 > --- a/drivers/gpu/drm/vmwgfx/device_include/vmware_pack_end.h > +++ b/drivers/gpu/drm/vmwgfx/device_include/vmware_pack_end.h > @@ -1,25 +1,2 @@ > -/********************************************************** > - * Copyright 2015 VMware, Inc. All rights reserved. > - * > - * Permission is hereby granted, free of charge, to any person > - * obtaining a copy of this software and associated documentation > - * files (the "Software"), to deal in the Software without > - * restriction, including without limitation the rights to use, copy, > - * modify, merge, publish, distribute, sublicense, and/or sell copies > - * of the Software, and to permit persons to whom the Software is > - * furnished to do so, subject to the following conditions: > - * > - * The above copyright notice and this permission notice shall be > - * included in all copies or substantial portions of the Software. > - * > - * 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. > - * > - **********************************************************/ > +/* SPDX-License-Identifier: GPL-2.0 */ > __packed For the changes that touch vmwgfx, Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Do you want me to take patch 7 and 8 through a vmwgfx pull request? /Thomas
On Mon, May 07, 2018 at 04:50:42PM +0200, Thomas Hellstrom wrote: > > Do you want me to take patch 7 and 8 through a vmwgfx pull request? I'm happy to follow any process that the different sub-teams here prefer. I sent this out as one series as it clearly is connected, but if you'd rather have them go through different paths, I'm happy for any guidance. Historically I tended to send things just to Linus, but I guess that isn't the preferred way of doing things anymore :-) /D
Hi Dirk, On 7 May 2018 at 00:16, Dirk Hohndel (VMware) <dirk@hohndel.org> wrote: > These files are licensed under GPL-2.0. > Removing the MIT boilerplate as that really didn't make any sense for > those two header files. > > Signed-off-by: Dirk Hohndel (VMware) <dirk@hohndel.org> > --- > drivers/gpu/drm/vmwgfx/Kconfig | 1 + > .../vmwgfx/device_include/vmware_pack_begin.h | 25 +------------------ > .../vmwgfx/device_include/vmware_pack_end.h | 25 +------------------ > 3 files changed, 3 insertions(+), 48 deletions(-) > > diff --git a/drivers/gpu/drm/vmwgfx/Kconfig b/drivers/gpu/drm/vmwgfx/Kconfig > index 8c308dac99c5..6b28a326f8bb 100644 > --- a/drivers/gpu/drm/vmwgfx/Kconfig > +++ b/drivers/gpu/drm/vmwgfx/Kconfig > @@ -1,3 +1,4 @@ > +# SPDX-License-Identifier: GPL-2.0 > config DRM_VMWGFX > tristate "DRM driver for VMware Virtual GPU" > depends on DRM && PCI && X86 && MMU > diff --git a/drivers/gpu/drm/vmwgfx/device_include/vmware_pack_begin.h b/drivers/gpu/drm/vmwgfx/device_include/vmware_pack_begin.h > index 7e7b0ce34aa2..75308bd0d970 100644 > --- a/drivers/gpu/drm/vmwgfx/device_include/vmware_pack_begin.h > +++ b/drivers/gpu/drm/vmwgfx/device_include/vmware_pack_begin.h > @@ -1,25 +1,2 @@ > -/********************************************************** > - * Copyright 2015 VMware, Inc. All rights reserved. > - * > - * Permission is hereby granted, free of charge, to any person > - * obtaining a copy of this software and associated documentation > - * files (the "Software"), to deal in the Software without > - * restriction, including without limitation the rights to use, copy, > - * modify, merge, publish, distribute, sublicense, and/or sell copies > - * of the Software, and to permit persons to whom the Software is > - * furnished to do so, subject to the following conditions: > - * > - * The above copyright notice and this permission notice shall be > - * included in all copies or substantial portions of the Software. > - * > - * 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. > - * > - **********************************************************/ > +/* SPDX-License-Identifier: GPL-2.0 */ IIRC "LFC191: Compliance Basics for Developers" was pretty clear that the copyright line should stay. If so, vmware_pack_end.h should also have it's copyright line reinstated. Mildly related: This patch adds the one-line license identifier and removes the bulky license text. While a later patch, does the former and not the latter. Any reason why they're not consistent? HTH Emil
> On May 8, 2018, at 2:57 AM, Emil Velikov <emil.l.velikov@gmail.com> wrote: > > IIRC "LFC191: Compliance Basics for Developers" was pretty clear that > the copyright line should stay. > If so, vmware_pack_end.h should also have it's copyright line reinstated. That's an interesting argument to have. Two points from my side a) VMware is the one removing its own copyright - I haven't seen any suggestion that that's not acceptable b) it is rather questionable if a single instruction is even copyrightable :-) > Mildly related: > This patch adds the one-line license identifier and removes the bulky > license text. For those licenses where that is allowable (GPL-2.0 or GPL-2.0+) > While a later patch, does the former and not the latter. Any reason > why they're not consistent? Yes, since MIT is a template license you can't remove it without making it impossible to follow the compliance requirements (the copyright becomes part of the license text). /D
diff --git a/drivers/gpu/drm/vmwgfx/Kconfig b/drivers/gpu/drm/vmwgfx/Kconfig index 8c308dac99c5..6b28a326f8bb 100644 --- a/drivers/gpu/drm/vmwgfx/Kconfig +++ b/drivers/gpu/drm/vmwgfx/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 config DRM_VMWGFX tristate "DRM driver for VMware Virtual GPU" depends on DRM && PCI && X86 && MMU diff --git a/drivers/gpu/drm/vmwgfx/device_include/vmware_pack_begin.h b/drivers/gpu/drm/vmwgfx/device_include/vmware_pack_begin.h index 7e7b0ce34aa2..75308bd0d970 100644 --- a/drivers/gpu/drm/vmwgfx/device_include/vmware_pack_begin.h +++ b/drivers/gpu/drm/vmwgfx/device_include/vmware_pack_begin.h @@ -1,25 +1,2 @@ -/********************************************************** - * Copyright 2015 VMware, Inc. All rights reserved. - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * 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. - * - **********************************************************/ +/* SPDX-License-Identifier: GPL-2.0 */ #include <linux/compiler.h> diff --git a/drivers/gpu/drm/vmwgfx/device_include/vmware_pack_end.h b/drivers/gpu/drm/vmwgfx/device_include/vmware_pack_end.h index e2e440ed3d44..e93d6f28b68c 100644 --- a/drivers/gpu/drm/vmwgfx/device_include/vmware_pack_end.h +++ b/drivers/gpu/drm/vmwgfx/device_include/vmware_pack_end.h @@ -1,25 +1,2 @@ -/********************************************************** - * Copyright 2015 VMware, Inc. All rights reserved. - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * 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. - * - **********************************************************/ +/* SPDX-License-Identifier: GPL-2.0 */ __packed
These files are licensed under GPL-2.0. Removing the MIT boilerplate as that really didn't make any sense for those two header files. Signed-off-by: Dirk Hohndel (VMware) <dirk@hohndel.org> --- drivers/gpu/drm/vmwgfx/Kconfig | 1 + .../vmwgfx/device_include/vmware_pack_begin.h | 25 +------------------ .../vmwgfx/device_include/vmware_pack_end.h | 25 +------------------ 3 files changed, 3 insertions(+), 48 deletions(-)