| Message ID | 20180502134621.25555-1-thellstrom@vmware.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Am 02.05.2018 um 15:46 schrieb Thomas Hellstrom: > From: Dirk Hohndel <dirk@hohndel.org> > > This is dual licensed under GPL-2.0 or MIT. > > Cc: "Christian König" <christian.koenig@amd.com> > Signed-off-by: Dirk Hohndel (VMware) <dirk@hohndel.org> > Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Acked-by: Christian König <christian.koenig@amd.com> If nobody objects I'm going to push it into our internal branch before the weekend. Thanks, Christian. > --- > 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(+) > > diff --git a/drivers/gpu/drm/ttm/ttm_agp_backend.c b/drivers/gpu/drm/ttm/ttm_agp_backend.c > index 7c2485fe88d8..ea4d59eb8966 100644 > --- a/drivers/gpu/drm/ttm/ttm_agp_backend.c > +++ b/drivers/gpu/drm/ttm/ttm_agp_backend.c > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > /************************************************************************** > * > * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA > diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c > index 98e06f8bf23b..68bcdd703cbd 100644 > --- a/drivers/gpu/drm/ttm/ttm_bo.c > +++ b/drivers/gpu/drm/ttm/ttm_bo.c > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > /************************************************************************** > * > * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA > diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c > index a7c232dc39cb..18d3debcc949 100644 > --- a/drivers/gpu/drm/ttm/ttm_bo_manager.c > +++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > /************************************************************************** > * > * Copyright (c) 2007-2010 VMware, Inc., Palo Alto, CA., USA > diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c > index 2ebbae6067ab..1c17aa6a7c3c 100644 > --- a/drivers/gpu/drm/ttm/ttm_bo_util.c > +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > /************************************************************************** > * > * Copyright (c) 2007-2009 VMware, Inc., Palo Alto, CA., USA > diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c > index 8eba95b3c737..c7ece7613a6a 100644 > --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c > +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > /************************************************************************** > * > * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA > diff --git a/drivers/gpu/drm/ttm/ttm_execbuf_util.c b/drivers/gpu/drm/ttm/ttm_execbuf_util.c > index 3dca206e85f7..e73ae0d22897 100644 > --- a/drivers/gpu/drm/ttm/ttm_execbuf_util.c > +++ b/drivers/gpu/drm/ttm/ttm_execbuf_util.c > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > /************************************************************************** > * > * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA > diff --git a/drivers/gpu/drm/ttm/ttm_lock.c b/drivers/gpu/drm/ttm/ttm_lock.c > index 913f4318cdc0..20694b8a01ca 100644 > --- a/drivers/gpu/drm/ttm/ttm_lock.c > +++ b/drivers/gpu/drm/ttm/ttm_lock.c > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > /************************************************************************** > * > * Copyright (c) 2007-2009 VMware, Inc., Palo Alto, CA., USA > diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c > index 27856c55dc84..450387c92b63 100644 > --- a/drivers/gpu/drm/ttm/ttm_memory.c > +++ b/drivers/gpu/drm/ttm/ttm_memory.c > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > /************************************************************************** > * > * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA > diff --git a/drivers/gpu/drm/ttm/ttm_module.c b/drivers/gpu/drm/ttm/ttm_module.c > index 66fc6395eb54..6ff40c041d79 100644 > --- a/drivers/gpu/drm/ttm/ttm_module.c > +++ b/drivers/gpu/drm/ttm/ttm_module.c > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > /************************************************************************** > * > * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA > diff --git a/drivers/gpu/drm/ttm/ttm_object.c b/drivers/gpu/drm/ttm/ttm_object.c > index 1aa2baa83959..74f1b1eb1f8e 100644 > --- a/drivers/gpu/drm/ttm/ttm_object.c > +++ b/drivers/gpu/drm/ttm/ttm_object.c > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > /************************************************************************** > * > * Copyright (c) 2009-2013 VMware, Inc., Palo Alto, CA., USA > diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c > index 7e672be987b5..a1e543972ca7 100644 > --- a/drivers/gpu/drm/ttm/ttm_tt.c > +++ b/drivers/gpu/drm/ttm/ttm_tt.c > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > /************************************************************************** > * > * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA
On 05/02/2018 04:00 PM, Christian König wrote: > Am 02.05.2018 um 15:46 schrieb Thomas Hellstrom: >> From: Dirk Hohndel <dirk@hohndel.org> >> >> This is dual licensed under GPL-2.0 or MIT. >> >> Cc: "Christian König" <christian.koenig@amd.com> >> Signed-off-by: Dirk Hohndel (VMware) <dirk@hohndel.org> >> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> > > Acked-by: Christian König <christian.koenig@amd.com> > > If nobody objects I'm going to push it into our internal branch before > the weekend. > > Thanks, > Christian. Thanks, Christian /Thomas
> On May 2, 2018, at 4:00 PM, Christian König <christian.koenig@amd.com> wrote: > > Am 02.05.2018 um 15:46 schrieb Thomas Hellstrom: >> From: Dirk Hohndel <dirk@hohndel.org> >> >> This is dual licensed under GPL-2.0 or MIT. >> >> Cc: "Christian König" <christian.koenig@amd.com> >> Signed-off-by: Dirk Hohndel (VMware) <dirk@hohndel.org> >> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> > > Acked-by: Christian König <christian.koenig@amd.com> > > If nobody objects I'm going to push it into our internal branch before the weekend. Excellent - thank you. /D
On Wed, May 02, 2018 at 03:46:21PM +0200, Thomas Hellstrom wrote: > From: Dirk Hohndel <dirk@hohndel.org> > > This is dual licensed under GPL-2.0 or MIT. > > Cc: "Christian König" <christian.koenig@amd.com> > Signed-off-by: Dirk Hohndel (VMware) <dirk@hohndel.org> > Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> > --- > 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(+) > > diff --git a/drivers/gpu/drm/ttm/ttm_agp_backend.c b/drivers/gpu/drm/ttm/ttm_agp_backend.c > index 7c2485fe88d8..ea4d59eb8966 100644 > --- a/drivers/gpu/drm/ttm/ttm_agp_backend.c > +++ b/drivers/gpu/drm/ttm/ttm_agp_backend.c > @@ -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 > diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c > index 98e06f8bf23b..68bcdd703cbd 100644 > --- a/drivers/gpu/drm/ttm/ttm_bo.c > +++ b/drivers/gpu/drm/ttm/ttm_bo.c > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > /************************************************************************** > * > * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA > diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c > index a7c232dc39cb..18d3debcc949 100644 > --- a/drivers/gpu/drm/ttm/ttm_bo_manager.c > +++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > /************************************************************************** > * > * Copyright (c) 2007-2010 VMware, Inc., Palo Alto, CA., USA > diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c > index 2ebbae6067ab..1c17aa6a7c3c 100644 > --- a/drivers/gpu/drm/ttm/ttm_bo_util.c > +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > /************************************************************************** > * > * Copyright (c) 2007-2009 VMware, Inc., Palo Alto, CA., USA > diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c > index 8eba95b3c737..c7ece7613a6a 100644 > --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c > +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > /************************************************************************** > * > * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA > diff --git a/drivers/gpu/drm/ttm/ttm_execbuf_util.c b/drivers/gpu/drm/ttm/ttm_execbuf_util.c > index 3dca206e85f7..e73ae0d22897 100644 > --- a/drivers/gpu/drm/ttm/ttm_execbuf_util.c > +++ b/drivers/gpu/drm/ttm/ttm_execbuf_util.c > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > /************************************************************************** > * > * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA > diff --git a/drivers/gpu/drm/ttm/ttm_lock.c b/drivers/gpu/drm/ttm/ttm_lock.c > index 913f4318cdc0..20694b8a01ca 100644 > --- a/drivers/gpu/drm/ttm/ttm_lock.c > +++ b/drivers/gpu/drm/ttm/ttm_lock.c > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > /************************************************************************** > * > * Copyright (c) 2007-2009 VMware, Inc., Palo Alto, CA., USA > diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c > index 27856c55dc84..450387c92b63 100644 > --- a/drivers/gpu/drm/ttm/ttm_memory.c > +++ b/drivers/gpu/drm/ttm/ttm_memory.c > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > /************************************************************************** > * > * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA > diff --git a/drivers/gpu/drm/ttm/ttm_module.c b/drivers/gpu/drm/ttm/ttm_module.c > index 66fc6395eb54..6ff40c041d79 100644 > --- a/drivers/gpu/drm/ttm/ttm_module.c > +++ b/drivers/gpu/drm/ttm/ttm_module.c > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > /************************************************************************** > * > * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA > diff --git a/drivers/gpu/drm/ttm/ttm_object.c b/drivers/gpu/drm/ttm/ttm_object.c > index 1aa2baa83959..74f1b1eb1f8e 100644 > --- a/drivers/gpu/drm/ttm/ttm_object.c > +++ b/drivers/gpu/drm/ttm/ttm_object.c > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > /************************************************************************** > * > * Copyright (c) 2009-2013 VMware, Inc., Palo Alto, CA., USA > diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c > index 7e672be987b5..a1e543972ca7 100644 > --- a/drivers/gpu/drm/ttm/ttm_tt.c > +++ b/drivers/gpu/drm/ttm/ttm_tt.c > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > /************************************************************************** > * > * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA > -- > 2.14.3 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
On Wed, May 02, 2018 at 04:12:18PM -0400, Sean Paul wrote: > On Wed, May 02, 2018 at 03:46:21PM +0200, Thomas Hellstrom wrote: > > From: Dirk Hohndel <dirk@hohndel.org> > > > > This is dual licensed under GPL-2.0 or MIT. > > > > Cc: "Christian König" <christian.koenig@amd.com> > > Signed-off-by: Dirk Hohndel (VMware) <dirk@hohndel.org> > > Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> > > --- > > 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(+) > > > > diff --git a/drivers/gpu/drm/ttm/ttm_agp_backend.c b/drivers/gpu/drm/ttm/ttm_agp_backend.c > > index 7c2485fe88d8..ea4d59eb8966 100644 > > --- a/drivers/gpu/drm/ttm/ttm_agp_backend.c > > +++ b/drivers/gpu/drm/ttm/ttm_agp_backend.c > > @@ -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 > Sean > > > diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c > > index 98e06f8bf23b..68bcdd703cbd 100644 > > --- a/drivers/gpu/drm/ttm/ttm_bo.c > > +++ b/drivers/gpu/drm/ttm/ttm_bo.c > > @@ -1,3 +1,4 @@ > > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > > /************************************************************************** > > * > > * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA > > diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c > > index a7c232dc39cb..18d3debcc949 100644 > > --- a/drivers/gpu/drm/ttm/ttm_bo_manager.c > > +++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c > > @@ -1,3 +1,4 @@ > > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > > /************************************************************************** > > * > > * Copyright (c) 2007-2010 VMware, Inc., Palo Alto, CA., USA > > diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c > > index 2ebbae6067ab..1c17aa6a7c3c 100644 > > --- a/drivers/gpu/drm/ttm/ttm_bo_util.c > > +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c > > @@ -1,3 +1,4 @@ > > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > > /************************************************************************** > > * > > * Copyright (c) 2007-2009 VMware, Inc., Palo Alto, CA., USA > > diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c > > index 8eba95b3c737..c7ece7613a6a 100644 > > --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c > > +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c > > @@ -1,3 +1,4 @@ > > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > > /************************************************************************** > > * > > * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA > > diff --git a/drivers/gpu/drm/ttm/ttm_execbuf_util.c b/drivers/gpu/drm/ttm/ttm_execbuf_util.c > > index 3dca206e85f7..e73ae0d22897 100644 > > --- a/drivers/gpu/drm/ttm/ttm_execbuf_util.c > > +++ b/drivers/gpu/drm/ttm/ttm_execbuf_util.c > > @@ -1,3 +1,4 @@ > > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > > /************************************************************************** > > * > > * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA > > diff --git a/drivers/gpu/drm/ttm/ttm_lock.c b/drivers/gpu/drm/ttm/ttm_lock.c > > index 913f4318cdc0..20694b8a01ca 100644 > > --- a/drivers/gpu/drm/ttm/ttm_lock.c > > +++ b/drivers/gpu/drm/ttm/ttm_lock.c > > @@ -1,3 +1,4 @@ > > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > > /************************************************************************** > > * > > * Copyright (c) 2007-2009 VMware, Inc., Palo Alto, CA., USA > > diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c > > index 27856c55dc84..450387c92b63 100644 > > --- a/drivers/gpu/drm/ttm/ttm_memory.c > > +++ b/drivers/gpu/drm/ttm/ttm_memory.c > > @@ -1,3 +1,4 @@ > > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > > /************************************************************************** > > * > > * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA > > diff --git a/drivers/gpu/drm/ttm/ttm_module.c b/drivers/gpu/drm/ttm/ttm_module.c > > index 66fc6395eb54..6ff40c041d79 100644 > > --- a/drivers/gpu/drm/ttm/ttm_module.c > > +++ b/drivers/gpu/drm/ttm/ttm_module.c > > @@ -1,3 +1,4 @@ > > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > > /************************************************************************** > > * > > * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA > > diff --git a/drivers/gpu/drm/ttm/ttm_object.c b/drivers/gpu/drm/ttm/ttm_object.c > > index 1aa2baa83959..74f1b1eb1f8e 100644 > > --- a/drivers/gpu/drm/ttm/ttm_object.c > > +++ b/drivers/gpu/drm/ttm/ttm_object.c > > @@ -1,3 +1,4 @@ > > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > > /************************************************************************** > > * > > * Copyright (c) 2009-2013 VMware, Inc., Palo Alto, CA., USA > > diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c > > index 7e672be987b5..a1e543972ca7 100644 > > --- a/drivers/gpu/drm/ttm/ttm_tt.c > > +++ b/drivers/gpu/drm/ttm/ttm_tt.c > > @@ -1,3 +1,4 @@ > > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > > /************************************************************************** > > * > > * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA > > -- > > 2.14.3 > > > > _______________________________________________ > > dri-devel mailing list > > dri-devel@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/dri-devel > > -- > Sean Paul, Software Engineer, Google / Chromium OS
On Wed, May 02, 2018 at 04:33:30PM -0400, Sean Paul wrote: > > > diff --git a/drivers/gpu/drm/ttm/ttm_agp_backend.c b/drivers/gpu/drm/ttm/ttm_agp_backend.c > > > index 7c2485fe88d8..ea4d59eb8966 100644 > > > --- a/drivers/gpu/drm/ttm/ttm_agp_backend.c > > > +++ b/drivers/gpu/drm/ttm/ttm_agp_backend.c > > > @@ -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. 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
On Wed, May 02, 2018 at 11:25:35PM +0200, Dirk Hohndel wrote: > On Wed, May 02, 2018 at 04:33:30PM -0400, Sean Paul wrote: > > > > diff --git a/drivers/gpu/drm/ttm/ttm_agp_backend.c b/drivers/gpu/drm/ttm/ttm_agp_backend.c > > > > index 7c2485fe88d8..ea4d59eb8966 100644 > > > > --- a/drivers/gpu/drm/ttm/ttm_agp_backend.c > > > > +++ b/drivers/gpu/drm/ttm/ttm_agp_backend.c > > > > @@ -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. > > 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. 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 > > /D
On Wed, May 2, 2018 at 10:46 AM, Thomas Hellstrom <thellstrom@vmware.com> wrote: > diff --git a/drivers/gpu/drm/ttm/ttm_agp_backend.c b/drivers/gpu/drm/ttm/ttm_agp_backend.c > index 7c2485fe88d8..ea4d59eb8966 100644 > --- a/drivers/gpu/drm/ttm/ttm_agp_backend.c > +++ b/drivers/gpu/drm/ttm/ttm_agp_backend.c > @@ -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.
Am 03.05.2018 um 15:03 schrieb Fabio Estevam: > On Wed, May 2, 2018 at 10:46 AM, Thomas Hellstrom <thellstrom@vmware.com> wrote: > >> diff --git a/drivers/gpu/drm/ttm/ttm_agp_backend.c b/drivers/gpu/drm/ttm/ttm_agp_backend.c >> index 7c2485fe88d8..ea4d59eb8966 100644 >> --- a/drivers/gpu/drm/ttm/ttm_agp_backend.c >> +++ b/drivers/gpu/drm/ttm/ttm_agp_backend.c >> @@ -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. 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.
On Thu, May 03, 2018 at 08:46:20AM -0400, Sean Paul wrote: > > 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
On Thu, May 03, 2018 at 10:03:32AM -0300, Fabio Estevam wrote: > On Wed, May 2, 2018 at 10:46 AM, Thomas Hellstrom <thellstrom@vmware.com> wrote: > > > diff --git a/drivers/gpu/drm/ttm/ttm_agp_backend.c b/drivers/gpu/drm/ttm/ttm_agp_backend.c > > index 7c2485fe88d8..ea4d59eb8966 100644 > > --- a/drivers/gpu/drm/ttm/ttm_agp_backend.c > > +++ b/drivers/gpu/drm/ttm/ttm_agp_backend.c > > @@ -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. 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 215364 So a majority seems to go with the "more Linux C file style" /* as comment marker... which is why I chose that... /D
On Thu, May 3, 2018 at 12:48 PM, Dirk Hohndel <dirk@hohndel.org> wrote: > 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.
Am 03.05.2018 um 14:46 schrieb Sean Paul: > On Wed, May 02, 2018 at 11:25:35PM +0200, Dirk Hohndel wrote: >> On Wed, May 02, 2018 at 04:33:30PM -0400, Sean Paul wrote: >>>>> diff --git a/drivers/gpu/drm/ttm/ttm_agp_backend.c b/drivers/gpu/drm/ttm/ttm_agp_backend.c >>>>> index 7c2485fe88d8..ea4d59eb8966 100644 >>>>> --- a/drivers/gpu/drm/ttm/ttm_agp_backend.c >>>>> +++ b/drivers/gpu/drm/ttm/ttm_agp_backend.c >>>>> @@ -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. >> 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. > 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. > 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 > >> /D
On Thu, May 3, 2018 at 11:41 AM, Dirk Hohndel <dirk@hohndel.org> wrote: > On Thu, May 03, 2018 at 08:46:20AM -0400, Sean Paul wrote: >> >> 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 > 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 > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
> On May 8, 2018, at 11:52 PM, Alex Deucher <alexdeucher@gmail.com> wrote: > > On Thu, May 3, 2018 at 11:41 AM, Dirk Hohndel <dirk@hohndel.org> wrote: >> On Thu, May 03, 2018 at 08:46:20AM -0400, Sean Paul wrote: >>> >>> 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. 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
On 05/08/2018 11:52 PM, Alex Deucher wrote: > On Thu, May 3, 2018 at 11:41 AM, Dirk Hohndel <dirk@hohndel.org> wrote: >> On Thu, May 03, 2018 at 08:46:20AM -0400, Sean Paul wrote: >>> 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 > 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
On Wed, May 2, 2018 at 10:00 AM, Christian König <christian.koenig@amd.com> wrote: > Am 02.05.2018 um 15:46 schrieb Thomas Hellstrom: >> >> From: Dirk Hohndel <dirk@hohndel.org> >> >> This is dual licensed under GPL-2.0 or MIT. >> >> Cc: "Christian König" <christian.koenig@amd.com> >> Signed-off-by: Dirk Hohndel (VMware) <dirk@hohndel.org> >> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> > > > Acked-by: Christian König <christian.koenig@amd.com> > > 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 > > Thanks, > Christian. > > >> --- >> 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(+) >> >> diff --git a/drivers/gpu/drm/ttm/ttm_agp_backend.c >> b/drivers/gpu/drm/ttm/ttm_agp_backend.c >> index 7c2485fe88d8..ea4d59eb8966 100644 >> --- a/drivers/gpu/drm/ttm/ttm_agp_backend.c >> +++ b/drivers/gpu/drm/ttm/ttm_agp_backend.c >> @@ -1,3 +1,4 @@ >> +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ >> >> /************************************************************************** >> * >> * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA >> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c >> index 98e06f8bf23b..68bcdd703cbd 100644 >> --- a/drivers/gpu/drm/ttm/ttm_bo.c >> +++ b/drivers/gpu/drm/ttm/ttm_bo.c >> @@ -1,3 +1,4 @@ >> +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ >> >> /************************************************************************** >> * >> * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA >> diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c >> b/drivers/gpu/drm/ttm/ttm_bo_manager.c >> index a7c232dc39cb..18d3debcc949 100644 >> --- a/drivers/gpu/drm/ttm/ttm_bo_manager.c >> +++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c >> @@ -1,3 +1,4 @@ >> +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ >> >> /************************************************************************** >> * >> * Copyright (c) 2007-2010 VMware, Inc., Palo Alto, CA., USA >> diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c >> b/drivers/gpu/drm/ttm/ttm_bo_util.c >> index 2ebbae6067ab..1c17aa6a7c3c 100644 >> --- a/drivers/gpu/drm/ttm/ttm_bo_util.c >> +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c >> @@ -1,3 +1,4 @@ >> +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ >> >> /************************************************************************** >> * >> * Copyright (c) 2007-2009 VMware, Inc., Palo Alto, CA., USA >> diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c >> b/drivers/gpu/drm/ttm/ttm_bo_vm.c >> index 8eba95b3c737..c7ece7613a6a 100644 >> --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c >> +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c >> @@ -1,3 +1,4 @@ >> +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ >> >> /************************************************************************** >> * >> * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA >> diff --git a/drivers/gpu/drm/ttm/ttm_execbuf_util.c >> b/drivers/gpu/drm/ttm/ttm_execbuf_util.c >> index 3dca206e85f7..e73ae0d22897 100644 >> --- a/drivers/gpu/drm/ttm/ttm_execbuf_util.c >> +++ b/drivers/gpu/drm/ttm/ttm_execbuf_util.c >> @@ -1,3 +1,4 @@ >> +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ >> >> /************************************************************************** >> * >> * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA >> diff --git a/drivers/gpu/drm/ttm/ttm_lock.c >> b/drivers/gpu/drm/ttm/ttm_lock.c >> index 913f4318cdc0..20694b8a01ca 100644 >> --- a/drivers/gpu/drm/ttm/ttm_lock.c >> +++ b/drivers/gpu/drm/ttm/ttm_lock.c >> @@ -1,3 +1,4 @@ >> +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ >> >> /************************************************************************** >> * >> * Copyright (c) 2007-2009 VMware, Inc., Palo Alto, CA., USA >> diff --git a/drivers/gpu/drm/ttm/ttm_memory.c >> b/drivers/gpu/drm/ttm/ttm_memory.c >> index 27856c55dc84..450387c92b63 100644 >> --- a/drivers/gpu/drm/ttm/ttm_memory.c >> +++ b/drivers/gpu/drm/ttm/ttm_memory.c >> @@ -1,3 +1,4 @@ >> +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ >> >> /************************************************************************** >> * >> * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA >> diff --git a/drivers/gpu/drm/ttm/ttm_module.c >> b/drivers/gpu/drm/ttm/ttm_module.c >> index 66fc6395eb54..6ff40c041d79 100644 >> --- a/drivers/gpu/drm/ttm/ttm_module.c >> +++ b/drivers/gpu/drm/ttm/ttm_module.c >> @@ -1,3 +1,4 @@ >> +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ >> >> /************************************************************************** >> * >> * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA >> diff --git a/drivers/gpu/drm/ttm/ttm_object.c >> b/drivers/gpu/drm/ttm/ttm_object.c >> index 1aa2baa83959..74f1b1eb1f8e 100644 >> --- a/drivers/gpu/drm/ttm/ttm_object.c >> +++ b/drivers/gpu/drm/ttm/ttm_object.c >> @@ -1,3 +1,4 @@ >> +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ >> >> /************************************************************************** >> * >> * Copyright (c) 2009-2013 VMware, Inc., Palo Alto, CA., USA >> diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c >> index 7e672be987b5..a1e543972ca7 100644 >> --- a/drivers/gpu/drm/ttm/ttm_tt.c >> +++ b/drivers/gpu/drm/ttm/ttm_tt.c >> @@ -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 > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
Am 14.05.2018 um 18:00 schrieb Alex Deucher: > On Wed, May 2, 2018 at 10:00 AM, Christian König > <christian.koenig@amd.com> wrote: >> Am 02.05.2018 um 15:46 schrieb Thomas Hellstrom: >>> From: Dirk Hohndel <dirk@hohndel.org> >>> >>> This is dual licensed under GPL-2.0 or MIT. >>> >>> Cc: "Christian König" <christian.koenig@amd.com> >>> Signed-off-by: Dirk Hohndel (VMware) <dirk@hohndel.org> >>> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> >> >> Acked-by: Christian König <christian.koenig@amd.com> >> >> 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. > > Alex > > >> Thanks, >> Christian. >> >> >>> --- >>> 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(+) >>> >>> diff --git a/drivers/gpu/drm/ttm/ttm_agp_backend.c >>> b/drivers/gpu/drm/ttm/ttm_agp_backend.c >>> index 7c2485fe88d8..ea4d59eb8966 100644 >>> --- a/drivers/gpu/drm/ttm/ttm_agp_backend.c >>> +++ b/drivers/gpu/drm/ttm/ttm_agp_backend.c >>> @@ -1,3 +1,4 @@ >>> +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ >>> >>> /************************************************************************** >>> * >>> * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA >>> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c >>> index 98e06f8bf23b..68bcdd703cbd 100644 >>> --- a/drivers/gpu/drm/ttm/ttm_bo.c >>> +++ b/drivers/gpu/drm/ttm/ttm_bo.c >>> @@ -1,3 +1,4 @@ >>> +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ >>> >>> /************************************************************************** >>> * >>> * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA >>> diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c >>> b/drivers/gpu/drm/ttm/ttm_bo_manager.c >>> index a7c232dc39cb..18d3debcc949 100644 >>> --- a/drivers/gpu/drm/ttm/ttm_bo_manager.c >>> +++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c >>> @@ -1,3 +1,4 @@ >>> +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ >>> >>> /************************************************************************** >>> * >>> * Copyright (c) 2007-2010 VMware, Inc., Palo Alto, CA., USA >>> diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c >>> b/drivers/gpu/drm/ttm/ttm_bo_util.c >>> index 2ebbae6067ab..1c17aa6a7c3c 100644 >>> --- a/drivers/gpu/drm/ttm/ttm_bo_util.c >>> +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c >>> @@ -1,3 +1,4 @@ >>> +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ >>> >>> /************************************************************************** >>> * >>> * Copyright (c) 2007-2009 VMware, Inc., Palo Alto, CA., USA >>> diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c >>> b/drivers/gpu/drm/ttm/ttm_bo_vm.c >>> index 8eba95b3c737..c7ece7613a6a 100644 >>> --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c >>> +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c >>> @@ -1,3 +1,4 @@ >>> +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ >>> >>> /************************************************************************** >>> * >>> * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA >>> diff --git a/drivers/gpu/drm/ttm/ttm_execbuf_util.c >>> b/drivers/gpu/drm/ttm/ttm_execbuf_util.c >>> index 3dca206e85f7..e73ae0d22897 100644 >>> --- a/drivers/gpu/drm/ttm/ttm_execbuf_util.c >>> +++ b/drivers/gpu/drm/ttm/ttm_execbuf_util.c >>> @@ -1,3 +1,4 @@ >>> +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ >>> >>> /************************************************************************** >>> * >>> * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA >>> diff --git a/drivers/gpu/drm/ttm/ttm_lock.c >>> b/drivers/gpu/drm/ttm/ttm_lock.c >>> index 913f4318cdc0..20694b8a01ca 100644 >>> --- a/drivers/gpu/drm/ttm/ttm_lock.c >>> +++ b/drivers/gpu/drm/ttm/ttm_lock.c >>> @@ -1,3 +1,4 @@ >>> +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ >>> >>> /************************************************************************** >>> * >>> * Copyright (c) 2007-2009 VMware, Inc., Palo Alto, CA., USA >>> diff --git a/drivers/gpu/drm/ttm/ttm_memory.c >>> b/drivers/gpu/drm/ttm/ttm_memory.c >>> index 27856c55dc84..450387c92b63 100644 >>> --- a/drivers/gpu/drm/ttm/ttm_memory.c >>> +++ b/drivers/gpu/drm/ttm/ttm_memory.c >>> @@ -1,3 +1,4 @@ >>> +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ >>> >>> /************************************************************************** >>> * >>> * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA >>> diff --git a/drivers/gpu/drm/ttm/ttm_module.c >>> b/drivers/gpu/drm/ttm/ttm_module.c >>> index 66fc6395eb54..6ff40c041d79 100644 >>> --- a/drivers/gpu/drm/ttm/ttm_module.c >>> +++ b/drivers/gpu/drm/ttm/ttm_module.c >>> @@ -1,3 +1,4 @@ >>> +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ >>> >>> /************************************************************************** >>> * >>> * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA >>> diff --git a/drivers/gpu/drm/ttm/ttm_object.c >>> b/drivers/gpu/drm/ttm/ttm_object.c >>> index 1aa2baa83959..74f1b1eb1f8e 100644 >>> --- a/drivers/gpu/drm/ttm/ttm_object.c >>> +++ b/drivers/gpu/drm/ttm/ttm_object.c >>> @@ -1,3 +1,4 @@ >>> +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ >>> >>> /************************************************************************** >>> * >>> * Copyright (c) 2009-2013 VMware, Inc., Palo Alto, CA., USA >>> diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c >>> index 7e672be987b5..a1e543972ca7 100644 >>> --- a/drivers/gpu/drm/ttm/ttm_tt.c >>> +++ b/drivers/gpu/drm/ttm/ttm_tt.c >>> @@ -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 >> dri-devel@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/ttm/ttm_agp_backend.c b/drivers/gpu/drm/ttm/ttm_agp_backend.c index 7c2485fe88d8..ea4d59eb8966 100644 --- a/drivers/gpu/drm/ttm/ttm_agp_backend.c +++ b/drivers/gpu/drm/ttm/ttm_agp_backend.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 98e06f8bf23b..68bcdd703cbd 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c index a7c232dc39cb..18d3debcc949 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_manager.c +++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2007-2010 VMware, Inc., Palo Alto, CA., USA diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index 2ebbae6067ab..1c17aa6a7c3c 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2007-2009 VMware, Inc., Palo Alto, CA., USA diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c index 8eba95b3c737..c7ece7613a6a 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA diff --git a/drivers/gpu/drm/ttm/ttm_execbuf_util.c b/drivers/gpu/drm/ttm/ttm_execbuf_util.c index 3dca206e85f7..e73ae0d22897 100644 --- a/drivers/gpu/drm/ttm/ttm_execbuf_util.c +++ b/drivers/gpu/drm/ttm/ttm_execbuf_util.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA diff --git a/drivers/gpu/drm/ttm/ttm_lock.c b/drivers/gpu/drm/ttm/ttm_lock.c index 913f4318cdc0..20694b8a01ca 100644 --- a/drivers/gpu/drm/ttm/ttm_lock.c +++ b/drivers/gpu/drm/ttm/ttm_lock.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2007-2009 VMware, Inc., Palo Alto, CA., USA diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c index 27856c55dc84..450387c92b63 100644 --- a/drivers/gpu/drm/ttm/ttm_memory.c +++ b/drivers/gpu/drm/ttm/ttm_memory.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA diff --git a/drivers/gpu/drm/ttm/ttm_module.c b/drivers/gpu/drm/ttm/ttm_module.c index 66fc6395eb54..6ff40c041d79 100644 --- a/drivers/gpu/drm/ttm/ttm_module.c +++ b/drivers/gpu/drm/ttm/ttm_module.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA diff --git a/drivers/gpu/drm/ttm/ttm_object.c b/drivers/gpu/drm/ttm/ttm_object.c index 1aa2baa83959..74f1b1eb1f8e 100644 --- a/drivers/gpu/drm/ttm/ttm_object.c +++ b/drivers/gpu/drm/ttm/ttm_object.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2009-2013 VMware, Inc., Palo Alto, CA., USA diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c index 7e672be987b5..a1e543972ca7 100644 --- a/drivers/gpu/drm/ttm/ttm_tt.c +++ b/drivers/gpu/drm/ttm/ttm_tt.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA