On Wed, May 2, 2018 at 10:00 AM, Christian König <christian.koenig@xxxxxxx> wrote: > Am 02.05.2018 um 15:46 schrieb Thomas Hellstrom: >> >> From: Dirk Hohndel <dirk@xxxxxxxxxxx> >> >> This is dual licensed under GPL-2.0 or MIT. >> >> Cc: "Christian König" <christian.koenig@xxxxxxx> >> Signed-off-by: Dirk Hohndel (VMware) <dirk@xxxxxxxxxxx> >> Signed-off-by: Thomas Hellstrom <thellstrom@xxxxxxxxxx> > > > Acked-by: Christian König <christian.koenig@xxxxxxx> > > 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@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
