Add SPDX idenitifier and clarify license
Subsystems (3)
PATCH 1/1 Add SPDX idenitifier and clarify license
From: Dirk Hohndel <[email protected]>
This is dual licensed under GPL-2.0 or MIT.
--- drivers/gpu/drm/ttm/ttm_agp_backend.c | 1 + drivers/gpu/drm/ttm/ttm_bo.c | 1 + drivers/gpu/drm/ttm/ttm_bo_manager.c | 1 + drivers/gpu/drm/ttm/ttm_bo_util.c | 1 + drivers/gpu/drm/ttm/ttm_bo_vm.c | 1 + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 1 + drivers/gpu/drm/ttm/ttm_lock.c | 1 + drivers/gpu/drm/ttm/ttm_memory.c | 1 + drivers/gpu/drm/ttm/ttm_module.c | 1 + drivers/gpu/drm/ttm/ttm_object.c | 1 + drivers/gpu/drm/ttm/ttm_tt.c | 1 + 11 files changed, 11 insertions(+)
drivers/gpu/drm/ttm/ttm_agp_backend.c +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA
drivers/gpu/drm/ttm/ttm_bo.c +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA
drivers/gpu/drm/ttm/ttm_bo_manager.c +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2007-2010 VMware, Inc., Palo Alto, CA., USA
drivers/gpu/drm/ttm/ttm_bo_util.c +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2007-2009 VMware, Inc., Palo Alto, CA., USA
drivers/gpu/drm/ttm/ttm_bo_vm.c +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA
drivers/gpu/drm/ttm/ttm_execbuf_util.c +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA
drivers/gpu/drm/ttm/ttm_lock.c +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2007-2009 VMware, Inc., Palo Alto, CA., USA
drivers/gpu/drm/ttm/ttm_memory.c +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA
drivers/gpu/drm/ttm/ttm_module.c +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA
drivers/gpu/drm/ttm/ttm_object.c +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2009-2013 VMware, Inc., Palo Alto, CA., USA
drivers/gpu/drm/ttm/ttm_tt.c +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA
Signature · 6 lines
2.14.3 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Am 02.05.2018 um 15:46 schrieb Thomas Hellstrom:
Quoted 7 lines
From: Dirk Hohndel <[email protected]>
This is dual licensed under GPL-2.0 or MIT.
Cc "Christian König" <[email protected]>Signed-off-by Dirk Hohndel (VMware) <[email protected]>Signed-off-by Thomas Hellstrom <[email protected]>
If nobody objects I'm going to push it into our internal branch before the weekend.
Thanks,
Christian.
Quoted 109 lines
--- drivers/gpu/drm/ttm/ttm_agp_backend.c | 1 + drivers/gpu/drm/ttm/ttm_bo.c | 1 + drivers/gpu/drm/ttm/ttm_bo_manager.c | 1 + drivers/gpu/drm/ttm/ttm_bo_util.c | 1 + drivers/gpu/drm/ttm/ttm_bo_vm.c | 1 + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 1 + drivers/gpu/drm/ttm/ttm_lock.c | 1 + drivers/gpu/drm/ttm/ttm_memory.c | 1 + drivers/gpu/drm/ttm/ttm_module.c | 1 + drivers/gpu/drm/ttm/ttm_object.c | 1 + drivers/gpu/drm/ttm/ttm_tt.c | 1 + 11 files changed, 11 insertions(+)drivers/gpu/drm/ttm/ttm_agp_backend.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA drivers/gpu/drm/ttm/ttm_bo.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA drivers/gpu/drm/ttm/ttm_bo_manager.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2007-2010 VMware, Inc., Palo Alto, CA., USA drivers/gpu/drm/ttm/ttm_bo_util.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2007-2009 VMware, Inc., Palo Alto, CA., USA drivers/gpu/drm/ttm/ttm_bo_vm.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA drivers/gpu/drm/ttm/ttm_execbuf_util.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA drivers/gpu/drm/ttm/ttm_lock.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2007-2009 VMware, Inc., Palo Alto, CA., USA drivers/gpu/drm/ttm/ttm_memory.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA drivers/gpu/drm/ttm/ttm_module.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA drivers/gpu/drm/ttm/ttm_object.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2009-2013 VMware, Inc., Palo Alto, CA., USA drivers/gpu/drm/ttm/ttm_tt.c +0
-0
drivers/gpu/drm/ttm/ttm_tt.c line 4
Quoted 4 lines
drivers/gpu/drm/ttm/ttm_tt.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 9 lines · Christian König
Am 02.05.2018 um 15:46 schrieb Thomas Hellstrom:
Quoted 7 lines
From: Dirk Hohndel <[email protected]>
This is dual licensed under GPL-2.0 or MIT.
Cc "Christian König" <[email protected]>Signed-off-by Dirk Hohndel (VMware) <[email protected]>Signed-off-by Thomas Hellstrom <[email protected]>
Quoted 6 lines
Acked-by Christian König <[email protected]>If nobody objects I'm going to push it into our internal branch before the weekend.
Thanks,
Christian.
Thanks, Christian
/Thomas
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 8 lines · Christian König
Am 02.05.2018 um 15:46 schrieb Thomas Hellstrom:
Quoted 4 lines
From: Dirk Hohndel <[email protected]>
This is dual licensed under GPL-2.0 or MIT.
Quoted 7 lines
Quoted 3 lines
Cc "Christian König" <[email protected]>Signed-off-by Dirk Hohndel (VMware) <[email protected]>Signed-off-by Thomas Hellstrom <[email protected]>Acked-by Christian König <[email protected]>If nobody objects I'm going to push it into our internal branch before the weekend.
Excellent - thank you.
/D
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 11 lines · Christian König
Am 02.05.2018 um 15:46 schrieb Thomas Hellstrom:
Quoted 8 lines
From: Dirk Hohndel <[email protected]>
This is dual licensed under GPL-2.0 or MIT.
Cc "Christian König" <[email protected]>Signed-off-by Dirk Hohndel (VMware) <[email protected]>Signed-off-by Thomas Hellstrom <[email protected]>
Quoted 4 lines
Acked-by Christian König <[email protected]>If nobody objects I'm going to push it into our internal branch before the weekend.
Did you ever push these? I don't see them in the tree.
Alex
Quoted 135 lines
Thanks,
Christian.Quoted 130 lines
--- drivers/gpu/drm/ttm/ttm_agp_backend.c | 1 + drivers/gpu/drm/ttm/ttm_bo.c | 1 + drivers/gpu/drm/ttm/ttm_bo_manager.c | 1 + drivers/gpu/drm/ttm/ttm_bo_util.c | 1 + drivers/gpu/drm/ttm/ttm_bo_vm.c | 1 + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 1 + drivers/gpu/drm/ttm/ttm_lock.c | 1 + drivers/gpu/drm/ttm/ttm_memory.c | 1 + drivers/gpu/drm/ttm/ttm_module.c | 1 + drivers/gpu/drm/ttm/ttm_object.c | 1 + drivers/gpu/drm/ttm/ttm_tt.c | 1 + 11 files changed, 11 insertions(+)drivers/gpu/drm/ttm/ttm_agp_backend.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA
drivers/gpu/drm/ttm/ttm_bo.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA
drivers/gpu/drm/ttm/ttm_bo_manager.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2007-2010 VMware, Inc., Palo Alto, CA., USA
drivers/gpu/drm/ttm/ttm_bo_util.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2007-2009 VMware, Inc., Palo Alto, CA., USA
drivers/gpu/drm/ttm/ttm_bo_vm.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA
drivers/gpu/drm/ttm/ttm_execbuf_util.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA
drivers/gpu/drm/ttm/ttm_lock.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2007-2009 VMware, Inc., Palo Alto, CA., USA
drivers/gpu/drm/ttm/ttm_memory.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA
drivers/gpu/drm/ttm/ttm_module.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA
drivers/gpu/drm/ttm/ttm_object.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2009-2013 VMware, Inc., Palo Alto, CA., USA
drivers/gpu/drm/ttm/ttm_tt.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */
Quoted 9 lines
Quoted 3 lines
drivers/gpu/drm/ttm/ttm_tt.c +0
-0/************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Am 14.05.2018 um 18:00 schrieb Alex Deucher:
Quoted 11 lines
Quoted 9 lines · Christian König
Am 02.05.2018 um 15:46 schrieb Thomas Hellstrom:
Quoted 7 lines
From: Dirk Hohndel <[email protected]>
This is dual licensed under GPL-2.0 or MIT.
Cc "Christian König" <[email protected]>Signed-off-by Dirk Hohndel (VMware) <[email protected]>Signed-off-by Thomas Hellstrom <[email protected]>
Quoted 5 lines
Quoted 4 lines
Acked-by Christian König <[email protected]>If nobody objects I'm going to push it into our internal branch before the weekend.
Did you ever push these? I don't see them in the tree.
Ah, yes totally forgot about that. I think they (and another patch) ended up in the blacklist.
Need to ping John once more and probably work with those guys to change our server side rules for pushing license changes a bit.
Christian.
Quoted 146 lines
Alex
Quoted 142 lines
Thanks,
Christian.Quoted 132 lines
--- drivers/gpu/drm/ttm/ttm_agp_backend.c | 1 + drivers/gpu/drm/ttm/ttm_bo.c | 1 + drivers/gpu/drm/ttm/ttm_bo_manager.c | 1 + drivers/gpu/drm/ttm/ttm_bo_util.c | 1 + drivers/gpu/drm/ttm/ttm_bo_vm.c | 1 + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 1 + drivers/gpu/drm/ttm/ttm_lock.c | 1 + drivers/gpu/drm/ttm/ttm_memory.c | 1 + drivers/gpu/drm/ttm/ttm_module.c | 1 + drivers/gpu/drm/ttm/ttm_object.c | 1 + drivers/gpu/drm/ttm/ttm_tt.c | 1 + 11 files changed, 11 insertions(+)drivers/gpu/drm/ttm/ttm_agp_backend.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA
drivers/gpu/drm/ttm/ttm_bo.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA
drivers/gpu/drm/ttm/ttm_bo_manager.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2007-2010 VMware, Inc., Palo Alto, CA., USA
drivers/gpu/drm/ttm/ttm_bo_util.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2007-2009 VMware, Inc., Palo Alto, CA., USA
drivers/gpu/drm/ttm/ttm_bo_vm.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA
drivers/gpu/drm/ttm/ttm_execbuf_util.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA
drivers/gpu/drm/ttm/ttm_lock.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2007-2009 VMware, Inc., Palo Alto, CA., USA
drivers/gpu/drm/ttm/ttm_memory.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA
drivers/gpu/drm/ttm/ttm_module.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA
drivers/gpu/drm/ttm/ttm_object.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2009-2013 VMware, Inc., Palo Alto, CA., USA
drivers/gpu/drm/ttm/ttm_tt.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * Quoted 1 line
* Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 26 lines · Thomas Hellstrom
From: Dirk Hohndel <[email protected]>
This is dual licensed under GPL-2.0 or MIT.
Cc "Christian König" <[email protected]>Signed-off-by Dirk Hohndel (VMware) <[email protected]>Signed-off-by Thomas Hellstrom <[email protected]>--- drivers/gpu/drm/ttm/ttm_agp_backend.c | 1 + drivers/gpu/drm/ttm/ttm_bo.c | 1 + drivers/gpu/drm/ttm/ttm_bo_manager.c | 1 + drivers/gpu/drm/ttm/ttm_bo_util.c | 1 + drivers/gpu/drm/ttm/ttm_bo_vm.c | 1 + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 1 + drivers/gpu/drm/ttm/ttm_lock.c | 1 + drivers/gpu/drm/ttm/ttm_memory.c | 1 + drivers/gpu/drm/ttm/ttm_module.c | 1 + drivers/gpu/drm/ttm/ttm_object.c | 1 + drivers/gpu/drm/ttm/ttm_tt.c | 1 + 11 files changed, 11 insertions(+)drivers/gpu/drm/ttm/ttm_agp_backend.c +0
-0
drivers/gpu/drm/ttm/ttm_agp_backend.c line 4
Quoted 4 lines
drivers/gpu/drm/ttm/ttm_agp_backend.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA
Probably a stupid question, but can't you remove the boilerplate license now?
Sean
Quoted 97 lines
drivers/gpu/drm/ttm/ttm_bo.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA drivers/gpu/drm/ttm/ttm_bo_manager.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2007-2010 VMware, Inc., Palo Alto, CA., USA drivers/gpu/drm/ttm/ttm_bo_util.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2007-2009 VMware, Inc., Palo Alto, CA., USA drivers/gpu/drm/ttm/ttm_bo_vm.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA drivers/gpu/drm/ttm/ttm_execbuf_util.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA drivers/gpu/drm/ttm/ttm_lock.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2007-2009 VMware, Inc., Palo Alto, CA., USA drivers/gpu/drm/ttm/ttm_memory.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA drivers/gpu/drm/ttm/ttm_module.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA drivers/gpu/drm/ttm/ttm_object.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2009-2013 VMware, Inc., Palo Alto, CA., USA drivers/gpu/drm/ttm/ttm_tt.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA Signature · 6 lines
2.14.3 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 22 lines · Sean Paul
Quoted 21 lines · Thomas Hellstrom
From: Dirk Hohndel <[email protected]>
This is dual licensed under GPL-2.0 or MIT.
Cc "Christian König" <[email protected]>Signed-off-by Dirk Hohndel (VMware) <[email protected]>Signed-off-by Thomas Hellstrom <[email protected]>--- drivers/gpu/drm/ttm/ttm_agp_backend.c | 1 + drivers/gpu/drm/ttm/ttm_bo.c | 1 + drivers/gpu/drm/ttm/ttm_bo_manager.c | 1 + drivers/gpu/drm/ttm/ttm_bo_util.c | 1 + drivers/gpu/drm/ttm/ttm_bo_vm.c | 1 + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 1 + drivers/gpu/drm/ttm/ttm_lock.c | 1 + drivers/gpu/drm/ttm/ttm_memory.c | 1 + drivers/gpu/drm/ttm/ttm_module.c | 1 + drivers/gpu/drm/ttm/ttm_object.c | 1 + drivers/gpu/drm/ttm/ttm_tt.c | 1 + 11 files changed, 11 insertions(+)
Quoted 12 lines
drivers/gpu/drm/ttm/ttm_agp_backend.c line 4
Quoted 9 lines
drivers/gpu/drm/ttm/ttm_agp_backend.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA Probably a stupid question, but can't you remove the boilerplate license now?
Answering my own question, there are differences between the license in the files and the SPDX license [1]. They are:
- the license in the files adds "(including the next paragraph)" in the second paragraph
- the files have "AND/OR ITS SUPPLIERS" in the third paragraph
- a couple of list items are transposed and changed, but should be fine according to [2]
So IANAL, but it seems like you should either add the SPDX and remove the boilerplate, or keep the boilerplate and skip the SPDX.
Sean
[1]- https://spdx.org/licenses/MIT.html
[2]- https://spdx.org/spdx-license-list/matching-guidelines
Quoted 102 lines
Sean
Quoted 97 lines
drivers/gpu/drm/ttm/ttm_bo.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA drivers/gpu/drm/ttm/ttm_bo_manager.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2007-2010 VMware, Inc., Palo Alto, CA., USA drivers/gpu/drm/ttm/ttm_bo_util.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2007-2009 VMware, Inc., Palo Alto, CA., USA drivers/gpu/drm/ttm/ttm_bo_vm.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA drivers/gpu/drm/ttm/ttm_execbuf_util.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA drivers/gpu/drm/ttm/ttm_lock.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2007-2009 VMware, Inc., Palo Alto, CA., USA drivers/gpu/drm/ttm/ttm_memory.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA drivers/gpu/drm/ttm/ttm_module.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA drivers/gpu/drm/ttm/ttm_object.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2009-2013 VMware, Inc., Palo Alto, CA., USA drivers/gpu/drm/ttm/ttm_tt.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA Signature · 6 lines
2.14.3 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-develSignature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 21 lines · Sean Paul
Quoted 12 lines
drivers/gpu/drm/ttm/ttm_agp_backend.c line 4
Quoted 9 lines
drivers/gpu/drm/ttm/ttm_agp_backend.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA Probably a stupid question, but can't you remove the boilerplate license now?
Answering my own question, there are differences between the license in the files and the SPDX license [1]. They are:
- the license in the files adds "(including the next paragraph)" in the second paragraph
- the files have "AND/OR ITS SUPPLIERS" in the third paragraph
- a couple of list items are transposed and changed, but should be fine according to [2]
Quoted 2 lines
So IANAL, but it seems like you should either add the SPDX and remove the boilerplate, or keep the boilerplate and skip the SPDX.
I am not a lawyer, either, so I asked a couple before starting this little project...
GPL and similar license boilerplate can be replaced (and I removed it from some files in other commits that I'm working on to clean up the files which originated from VMware), but the MIT license is a template license and because of that the Copyright notice is actually part of the license and in order for people to be able to reproduce that, you aren't supposed to remove the boilerplate.
There are a number of variations of the MIT license, a bit of googling seems to indicate that the text that already existed in those files is the MIT/X-Consortium flavor of the license - that's where the "including the next paragraph" can be found, see here
https://www.x.org/releases/X11R7.7/doc/xorg-docs/License.html
SPDX appears to consider those licenses equivalent (they have a different, older flavor of the X11 license as "X11".
Similarly, the "and/or its suppliers" language seems to have been added by some project around X (but I wasn't able to pin down where exactly it came from), but once again the lawyers don't appear to see an issue.
So in summary
- we need to keep the boilerplate for MIT (but not GPL)
- the text modifications should be OK (and the scanners appear to recognize the existing text as MIT)
Not sure this answers your question.
/D
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 48 lines · Dirk Hohndel
Quoted 21 lines · Sean Paul
Quoted 12 lines
drivers/gpu/drm/ttm/ttm_agp_backend.c line 4
Quoted 9 lines
drivers/gpu/drm/ttm/ttm_agp_backend.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA Probably a stupid question, but can't you remove the boilerplate license now?
Answering my own question, there are differences between the license in the files and the SPDX license [1]. They are:
- the license in the files adds "(including the next paragraph)" in the second paragraph
- the files have "AND/OR ITS SUPPLIERS" in the third paragraph
- a couple of list items are transposed and changed, but should be fine according to [2]Quoted 2 lines
So IANAL, but it seems like you should either add the SPDX and remove the boilerplate, or keep the boilerplate and skip the SPDX.
I am not a lawyer, either, so I asked a couple before starting this little project...
GPL and similar license boilerplate can be replaced (and I removed it from some files in other commits that I'm working on to clean up the files which originated from VMware), but the MIT license is a template license and because of that the Copyright notice is actually part of the license and in order for people to be able to reproduce that, you aren't supposed to remove the boilerplate.
There are a number of variations of the MIT license, a bit of googling seems to indicate that the text that already existed in those files is the MIT/X-Consortium flavor of the license - that's where the "including the next paragraph" can be found, see here
https://www.x.org/releases/X11R7.7/doc/xorg-docs/License.htmlSPDX appears to consider those licenses equivalent (they have a different, older flavor of the X11 license as "X11".
Similarly, the "and/or its suppliers" language seems to have been added by some project around X (but I wasn't able to pin down where exactly it came from), but once again the lawyers don't appear to see an issue.
Quoted 6 lines
So in summary
- we need to keep the boilerplate for MIT (but not GPL)
- the text modifications should be OK (and the scanners appear to recognize the existing text as MIT)Not sure this answers your question.
Thank you for the awesome summary, it is very helpful! So since the boilerplate has to stay, is there a benefit to adding the SPDX header? Is it just to make scripting/scraping easier?
Sean
Quoted 2 lines
/D
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 4 lines · Sean Paul
Thank you for the awesome summary, it is very helpful! So since the boilerplate has to stay, is there a benefit to adding the SPDX header? Is it just to make scripting/scraping easier?
Actually, the header now adds the correct information. Without the header it is not clear that these files are supposed to be dual licensed under MIT or GPL-2.
And yes, it of course simplifies tooling as well, which is why there is a push to get these headers broadly added to many open source projects.
/D
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 10 lines · Dirk Hohndel
Quoted 4 lines · Sean Paul
Thank you for the awesome summary, it is very helpful! So since the boilerplate has to stay, is there a benefit to adding the SPDX header? Is it just to make scripting/scraping easier?
Actually, the header now adds the correct information. Without the header it is not clear that these files are supposed to be dual licensed under MIT or GPL-2.
Should these (or any of the drm drivers for that matter) be dual licensed or just MIT? The code is MIT.
Alex
Quoted 8 lines
And yes, it of course simplifies tooling as well, which is why there is a push to get these headers broadly added to many open source projects.
/D
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 10 lines · Alex Deucher
Quoted 6 lines · Dirk Hohndel
Quoted 4 lines · Sean Paul
Thank you for the awesome summary, it is very helpful! So since the boilerplate has to stay, is there a benefit to adding the SPDX header? Is it just to make scripting/scraping easier?
Quoted 7 lines
Quoted 4 lines
Actually, the header now adds the correct information. Without the header it is not clear that these files are supposed to be dual licensed under MIT or GPL-2.
Should these (or any of the drm drivers for that matter) be dual licensed or just MIT? The code is MIT.
I can't speak for the copyright owners for other files - where VMware holds copyright our intent is to have this be dual licensed MIT or GPL-2.0
/D
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 5 lines · Alex Deucher
Quoted 4 lines · Dirk Hohndel
Quoted 3 lines · Sean Paul
Thank you for the awesome summary, it is very helpful! So since the boilerplate has to stay, is there a benefit to adding the SPDX header? Is it just to make scripting/scraping easier?
Quoted 9 lines
Quoted 4 lines
Actually, the header now adds the correct information. Without the header it is not clear that these files are supposed to be dual licensed under MIT or GPL-2.
Should these (or any of the drm drivers for that matter) be dual licensed or just MIT? The code is MIT.
Alex
A "grep LICENSE find . -name '*.c'" seems to indicate that most if not all of the drm code and drivers are at least GPL licensed. Many of them claim "GPL and additional rights".
/Thomas
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Am 03.05.2018 um 14:46 schrieb Sean Paul:
Quoted 46 lines · Dirk Hohndel
Quoted 45 lines · Sean Paul
Quoted 19 lines
Quoted 11 lines
drivers/gpu/drm/ttm/ttm_agp_backend.c line 4
Quoted 9 lines
drivers/gpu/drm/ttm/ttm_agp_backend.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA Probably a stupid question, but can't you remove the boilerplate license now?
Answering my own question, there are differences between the license in the files and the SPDX license [1]. They are:
- the license in the files adds "(including the next paragraph)" in the second paragraph
- the files have "AND/OR ITS SUPPLIERS" in the third paragraph
- a couple of list items are transposed and changed, but should be fine according to [2]Quoted 2 lines
So IANAL, but it seems like you should either add the SPDX and remove the boilerplate, or keep the boilerplate and skip the SPDX.
I am not a lawyer, either, so I asked a couple before starting this little project...
GPL and similar license boilerplate can be replaced (and I removed it from some files in other commits that I'm working on to clean up the files which originated from VMware), but the MIT license is a template license and because of that the Copyright notice is actually part of the license and in order for people to be able to reproduce that, you aren't supposed to remove the boilerplate.
There are a number of variations of the MIT license, a bit of googling seems to indicate that the text that already existed in those files is the MIT/X-Consortium flavor of the license - that's where the "including the next paragraph" can be found, see here
https://www.x.org/releases/X11R7.7/doc/xorg-docs/License.htmlSPDX appears to consider those licenses equivalent (they have a different, older flavor of the X11 license as "X11".
Similarly, the "and/or its suppliers" language seems to have been added by some project around X (but I wasn't able to pin down where exactly it came from), but once again the lawyers don't appear to see an issue.
Quoted 7 lines
Quoted 6 lines
So in summary
- we need to keep the boilerplate for MIT (but not GPL)
- the text modifications should be OK (and the scanners appear to recognize the existing text as MIT)Not sure this answers your question.
Thank you for the awesome summary, it is very helpful!
Indeed that is a really cool explanation, going to keep that around for the next time somebody requests to remove the headers.
Thanks,
Christian.
Quoted 7 lines
So since the boilerplate
has to stay, is there a benefit to adding the SPDX header? Is it just to make scripting/scraping easier?Sean
Quoted 1 line
/D
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
drivers/gpu/drm/ttm/ttm_agp_backend.c line 1
Quoted 6 lines · Thomas Hellstrom
drivers/gpu/drm/ttm/ttm_agp_backend.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */
According to Documentation/process/license-rules.rst the SPDX tag should start with // in .c files.
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Am 03.05.2018 um 15:03 schrieb Fabio Estevam:
Quoted 10 lines · Thomas Hellstrom
drivers/gpu/drm/ttm/ttm_agp_backend.c line 1
Quoted 7 lines
drivers/gpu/drm/ttm/ttm_agp_backend.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ According to
Documentation/process/license-rules.rstthe SPDX tag should start with // in .c files.
Interesting, wasn't the long term coding style rule to not use C++ style comment in Linux C files?
How does it come to abandon that now?
Christian.
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 11 lines · Fabio Estevam
drivers/gpu/drm/ttm/ttm_agp_backend.c line 1
Quoted 6 lines · Thomas Hellstrom
drivers/gpu/drm/ttm/ttm_agp_backend.c +1
-0@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ According to
Documentation/process/license-rules.rstthe SPDX tag should start with // in .c files.
I saw that... but looking at what's there in C code:
hohndel@rrmbpvm:~/src/linux[VMware-license-cleanup]
$ git grep SPDX | grep \.c: | cut -d: -f2 | sort | grep ^// | wc 5260 10519 142020 hohndel@rrmbpvm:~/src/linux[VMware-license-cleanup] $ git grep SPDX | grep \.c: | cut -d: -f2 | sort | grep ^/\* | wc 5397 10792 145680
(ok, that's close...)
But if you do the same analysis for header files...
hohndel@rrmbpvm:~/src/linux[VMware-license-cleanup]
$ git grep SPDX | grep \.h: | cut -d: -f2 | sort | grep ^// | wc
549 1098 14823
hohndel@rrmbpvm:~/src/linux[VMware-license-cleanup]
$ git grep SPDX | grep \.h: | cut -d: -f2 | sort | grep ^/\* | wc
7981 15962 215364So a majority seems to go with the "more Linux C file style" /* as comment marker... which is why I chose that...
/D
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 8 lines · Dirk Hohndel
But if you do the same analysis for header files...
hohndel@rrmbpvm:~/src/linux[VMware-license-cleanup]
$ git grep SPDX | grep \.h: | cut -d: -f2 | sort | grep ^// | wc 549 1098 14823 hohndel@rrmbpvm:~/src/linux[VMware-license-cleanup] $ git grep SPDX | grep \.h: | cut -d: -f2 | sort | grep ^/\* | wc 7981 15962 215364
Right, Documentation/process/license-rules.rst says /* style should be used for .h files.
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel