| Message ID | 1462864733-31610-1-git-send-email-inki.dae@samsung.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
Hi Inki, I guess you need some kind of tag from me here? I'm not sure if it should be Acked-by or Reviewed-by. @Emil: You're the expert, what should it be? I also would suggest to change the commit description to _why_ this change is needed (and not just copy the commit subject). With best wishes, Tobias Inki Dae wrote: > This patch changes GPL license to X11/MIT. > > Signed-off-by: Inki Dae <inki.dae@samsung.com> > --- > exynos/exynos_fimg2d.c | 21 +++++++++++++++++---- > exynos/exynos_fimg2d.h | 21 +++++++++++++++++---- > exynos/fimg2d_reg.h | 21 +++++++++++++++++---- > tests/exynos/exynos_fimg2d_event.c | 27 +++++++++++++++++---------- > tests/exynos/exynos_fimg2d_perf.c | 27 +++++++++++++++++---------- > tests/exynos/exynos_fimg2d_test.c | 21 +++++++++++++++++---- > 6 files changed, 102 insertions(+), 36 deletions(-) > > diff --git a/exynos/exynos_fimg2d.c b/exynos/exynos_fimg2d.c > index 7f1d105..7127ef0 100644 > --- a/exynos/exynos_fimg2d.c > +++ b/exynos/exynos_fimg2d.c > @@ -3,11 +3,24 @@ > * Authors: > * Inki Dae <inki.dae@samsung.com> > * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of the GNU General Public License as published by the > - * Free Software Foundation; either version 2 of the License, or (at your > - * option) any later version. > + * Permission is hereby granted, free of charge, to any person obtaining a > + * copy of this software and associated documentation files (the "Software"), > + * to deal in the Software without restriction, including without limitation > + * the rights to use, copy, modify, merge, publish, distribute, sublicense, > + * and/or sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following conditions: > * > + * The above copyright notice and this permission notice (including the next > + * paragraph) shall be included in all copies or substantial portions of the > + * Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > + * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR > + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, > + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. > */ > > #ifdef HAVE_CONFIG_H > diff --git a/exynos/exynos_fimg2d.h b/exynos/exynos_fimg2d.h > index a825c68..a4dfbe7 100644 > --- a/exynos/exynos_fimg2d.h > +++ b/exynos/exynos_fimg2d.h > @@ -3,11 +3,24 @@ > * Authors: > * Inki Dae <inki.dae@samsung.com> > * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of the GNU General Public License as published by the > - * Free Software Foundation; either version 2 of the License, or (at your > - * option) any later version. > + * Permission is hereby granted, free of charge, to any person obtaining a > + * copy of this software and associated documentation files (the "Software"), > + * to deal in the Software without restriction, including without limitation > + * the rights to use, copy, modify, merge, publish, distribute, sublicense, > + * and/or sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following conditions: > * > + * The above copyright notice and this permission notice (including the next > + * paragraph) shall be included in all copies or substantial portions of the > + * Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > + * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR > + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, > + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. > */ > > #ifndef _FIMG2D_H_ > diff --git a/exynos/fimg2d_reg.h b/exynos/fimg2d_reg.h > index 07dd634..d42296d 100644 > --- a/exynos/fimg2d_reg.h > +++ b/exynos/fimg2d_reg.h > @@ -3,11 +3,24 @@ > * Authors: > * Inki Dae <inki.dae@samsung.com> > * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of the GNU General Public License as published by the > - * Free Software Foundation; either version 2 of the License, or (at your > - * option) any later version. > + * Permission is hereby granted, free of charge, to any person obtaining a > + * copy of this software and associated documentation files (the "Software"), > + * to deal in the Software without restriction, including without limitation > + * the rights to use, copy, modify, merge, publish, distribute, sublicense, > + * and/or sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following conditions: > * > + * The above copyright notice and this permission notice (including the next > + * paragraph) shall be included in all copies or substantial portions of the > + * Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > + * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR > + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, > + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. > */ > > #ifndef _FIMG2D_REG_H_ > diff --git a/tests/exynos/exynos_fimg2d_event.c b/tests/exynos/exynos_fimg2d_event.c > index 9ed5a30..353e087 100644 > --- a/tests/exynos/exynos_fimg2d_event.c > +++ b/tests/exynos/exynos_fimg2d_event.c > @@ -1,17 +1,24 @@ > /* > * Copyright (C) 2015 - Tobias Jakobi > * > - * This is free software: you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published > - * by the Free Software Foundation, either version 2 of the License, > - * or (at your option) any later version. > + * Permission is hereby granted, free of charge, to any person obtaining a > + * copy of this software and associated documentation files (the "Software"), > + * to deal in the Software without restriction, including without limitation > + * the rights to use, copy, modify, merge, publish, distribute, sublicense, > + * and/or sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following conditions: > * > - * It is distributed in the hope that it will be useful, but > - * WITHOUT ANY WARRANTY; without even the implied warranty of > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > - * GNU General Public License for more details. > - * You should have received a copy of the GNU General Public License > - * along with it. If not, see <http://www.gnu.org/licenses/>. > + * The above copyright notice and this permission notice (including the next > + * paragraph) shall be included in all copies or substantial portions of the > + * Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > + * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR > + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, > + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. > */ > > #include <unistd.h> > diff --git a/tests/exynos/exynos_fimg2d_perf.c b/tests/exynos/exynos_fimg2d_perf.c > index 1699bba..a2d5c19 100644 > --- a/tests/exynos/exynos_fimg2d_perf.c > +++ b/tests/exynos/exynos_fimg2d_perf.c > @@ -1,17 +1,24 @@ > /* > * Copyright (C) 2015 - Tobias Jakobi > * > - * This is free software: you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published > - * by the Free Software Foundation, either version 2 of the License, > - * or (at your option) any later version. > + * Permission is hereby granted, free of charge, to any person obtaining a > + * copy of this software and associated documentation files (the "Software"), > + * to deal in the Software without restriction, including without limitation > + * the rights to use, copy, modify, merge, publish, distribute, sublicense, > + * and/or sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following conditions: > * > - * It is distributed in the hope that it will be useful, but > - * WITHOUT ANY WARRANTY; without even the implied warranty of > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > - * GNU General Public License for more details. > - * You should have received a copy of the GNU General Public License > - * along with it. If not, see <http://www.gnu.org/licenses/>. > + * The above copyright notice and this permission notice (including the next > + * paragraph) shall be included in all copies or substantial portions of the > + * Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > + * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR > + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, > + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. > */ > > #include <stdlib.h> > diff --git a/tests/exynos/exynos_fimg2d_test.c b/tests/exynos/exynos_fimg2d_test.c > index 797fb6e..73a74dc 100644 > --- a/tests/exynos/exynos_fimg2d_test.c > +++ b/tests/exynos/exynos_fimg2d_test.c > @@ -3,11 +3,24 @@ > * Authors: > * Inki Dae <inki.dae@samsung.com> > * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of the GNU General Public License as published by the > - * Free Software Foundation; either version 2 of the License, or (at your > - * option) any later version. > + * Permission is hereby granted, free of charge, to any person obtaining a > + * copy of this software and associated documentation files (the "Software"), > + * to deal in the Software without restriction, including without limitation > + * the rights to use, copy, modify, merge, publish, distribute, sublicense, > + * and/or sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following conditions: > * > + * The above copyright notice and this permission notice (including the next > + * paragraph) shall be included in all copies or substantial portions of the > + * Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > + * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR > + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, > + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. > */ > > #ifdef HAVE_CONFIG_H > -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, May 10, 2016 at 2:35 PM, Tobias Jakobi <tjakobi@math.uni-bielefeld.de> wrote: > > Hi Inki, > > I guess you need some kind of tag from me here? I'm not sure if it > should be Acked-by or Reviewed-by. Also other people contributed there in the past (in the previous license) so I guess consent from all of them is required. Best regards, Krzysztof -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Inki, all, On 10 May 2016 at 08:18, Inki Dae <inki.dae@samsung.com> wrote: > This patch changes GPL license to X11/MIT. > As mentioned by Tobias, the commit messages should elaborate on the summary - why the change is needed, how it's achieved. Is this change due to my recent(ish) request on the topic of licenses, because some distributions don't include GPL code or otherwise ? In the first case, I was talking about the license miss-match between the kernel and libdrm version of exynos_drm.h. Whatever the reason, one should check with all contributors who touched the files in question. > Signed-off-by: Inki Dae <inki.dae@samsung.com> > --- > exynos/exynos_fimg2d.c | 21 +++++++++++++++++---- > exynos/exynos_fimg2d.h | 21 +++++++++++++++++---- > exynos/fimg2d_reg.h | 21 +++++++++++++++++---- > tests/exynos/exynos_fimg2d_event.c | 27 +++++++++++++++++---------- > tests/exynos/exynos_fimg2d_perf.c | 27 +++++++++++++++++---------- > tests/exynos/exynos_fimg2d_test.c | 21 +++++++++++++++++---- > 6 files changed, 102 insertions(+), 36 deletions(-) > $ git log -- exynos/fimg2d_reg.h exynos/exynos_fimg2d.* tests/exynos/exynos_fimg2d_* | grep ^Author | sort -u Author: Daniel Kurtz <djkurtz@chromium.org> Author: Emil Velikov <emil.l.velikov@gmail.com> Author: Inki Dae <inki.dae@samsung.com> Author: Jan Vesely <jan.vesely@rutgers.edu> Author: Maarten Lankhorst <maarten.lankhorst@canonical.com> // check with the linux kernel logs for alternative email Author: Tobias Jakobi <tjakobi@math.uni-bielefeld.de> I doubt any of them will have objections, but still - do reach out for confirmation. Personally I'm ok with either license, so Acked-by: Emil Velikov <emil.l.velikov@gmail.com> Thanks Emil -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Emil, Really sorry for late. Forgot this for a long time. 2016년 05월 12일 06:39에 Emil Velikov 이(가) 쓴 글: > Hi Inki, all, > > On 10 May 2016 at 08:18, Inki Dae <inki.dae@samsung.com> wrote: >> This patch changes GPL license to X11/MIT. >> > As mentioned by Tobias, the commit messages should elaborate on the > summary - why the change is needed, how it's achieved. libdrm has no representative license file like Linux and other open source trees. Linux mainline case below, https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/COPYING?id=refs/tags/v4.11-rc6 So I'd like to keep the license consistency of MIT license other code in libdrm have to be keepped with one license. I think keeping two more licenses here would make business projects confusing. > > Is this change due to my recent(ish) request on the topic of licenses, > because some distributions don't include GPL code or otherwise ? > > In the first case, I was talking about the license miss-match between > the kernel and libdrm version of exynos_drm.h. > Whatever the reason, one should check with all contributors who > touched the files in question. Right. > >> Signed-off-by: Inki Dae <inki.dae@samsung.com> >> --- >> exynos/exynos_fimg2d.c | 21 +++++++++++++++++---- >> exynos/exynos_fimg2d.h | 21 +++++++++++++++++---- >> exynos/fimg2d_reg.h | 21 +++++++++++++++++---- >> tests/exynos/exynos_fimg2d_event.c | 27 +++++++++++++++++---------- >> tests/exynos/exynos_fimg2d_perf.c | 27 +++++++++++++++++---------- >> tests/exynos/exynos_fimg2d_test.c | 21 +++++++++++++++++---- >> 6 files changed, 102 insertions(+), 36 deletions(-) >> > > $ git log -- exynos/fimg2d_reg.h exynos/exynos_fimg2d.* > tests/exynos/exynos_fimg2d_* | grep ^Author | sort -u > Author: Daniel Kurtz <djkurtz@chromium.org> > Author: Emil Velikov <emil.l.velikov@gmail.com> > Author: Inki Dae <inki.dae@samsung.com> > Author: Jan Vesely <jan.vesely@rutgers.edu> > Author: Maarten Lankhorst <maarten.lankhorst@canonical.com> // check > with the linux kernel logs for alternative email > Author: Tobias Jakobi <tjakobi@math.uni-bielefeld.de> > > I doubt any of them will have objections, but still - do reach out for > confirmation. Personally I'm ok with either license, so > Acked-by: Emil Velikov <emil.l.velikov@gmail.com> I will resend this patch including updated one for more discussion also ccing other committers. Thanks, Inki Dae > > Thanks > Emil > -- > To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > > -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/exynos/exynos_fimg2d.c b/exynos/exynos_fimg2d.c index 7f1d105..7127ef0 100644 --- a/exynos/exynos_fimg2d.c +++ b/exynos/exynos_fimg2d.c @@ -3,11 +3,24 @@ * Authors: * Inki Dae <inki.dae@samsung.com> * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. */ #ifdef HAVE_CONFIG_H diff --git a/exynos/exynos_fimg2d.h b/exynos/exynos_fimg2d.h index a825c68..a4dfbe7 100644 --- a/exynos/exynos_fimg2d.h +++ b/exynos/exynos_fimg2d.h @@ -3,11 +3,24 @@ * Authors: * Inki Dae <inki.dae@samsung.com> * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. */ #ifndef _FIMG2D_H_ diff --git a/exynos/fimg2d_reg.h b/exynos/fimg2d_reg.h index 07dd634..d42296d 100644 --- a/exynos/fimg2d_reg.h +++ b/exynos/fimg2d_reg.h @@ -3,11 +3,24 @@ * Authors: * Inki Dae <inki.dae@samsung.com> * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. */ #ifndef _FIMG2D_REG_H_ diff --git a/tests/exynos/exynos_fimg2d_event.c b/tests/exynos/exynos_fimg2d_event.c index 9ed5a30..353e087 100644 --- a/tests/exynos/exynos_fimg2d_event.c +++ b/tests/exynos/exynos_fimg2d_event.c @@ -1,17 +1,24 @@ /* * Copyright (C) 2015 - Tobias Jakobi * - * This is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation, either version 2 of the License, - * or (at your option) any later version. + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * - * It is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * You should have received a copy of the GNU General Public License - * along with it. If not, see <http://www.gnu.org/licenses/>. + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. */ #include <unistd.h> diff --git a/tests/exynos/exynos_fimg2d_perf.c b/tests/exynos/exynos_fimg2d_perf.c index 1699bba..a2d5c19 100644 --- a/tests/exynos/exynos_fimg2d_perf.c +++ b/tests/exynos/exynos_fimg2d_perf.c @@ -1,17 +1,24 @@ /* * Copyright (C) 2015 - Tobias Jakobi * - * This is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation, either version 2 of the License, - * or (at your option) any later version. + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * - * It is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * You should have received a copy of the GNU General Public License - * along with it. If not, see <http://www.gnu.org/licenses/>. + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. */ #include <stdlib.h> diff --git a/tests/exynos/exynos_fimg2d_test.c b/tests/exynos/exynos_fimg2d_test.c index 797fb6e..73a74dc 100644 --- a/tests/exynos/exynos_fimg2d_test.c +++ b/tests/exynos/exynos_fimg2d_test.c @@ -3,11 +3,24 @@ * Authors: * Inki Dae <inki.dae@samsung.com> * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. */ #ifdef HAVE_CONFIG_H
This patch changes GPL license to X11/MIT. Signed-off-by: Inki Dae <inki.dae@samsung.com> --- exynos/exynos_fimg2d.c | 21 +++++++++++++++++---- exynos/exynos_fimg2d.h | 21 +++++++++++++++++---- exynos/fimg2d_reg.h | 21 +++++++++++++++++---- tests/exynos/exynos_fimg2d_event.c | 27 +++++++++++++++++---------- tests/exynos/exynos_fimg2d_perf.c | 27 +++++++++++++++++---------- tests/exynos/exynos_fimg2d_test.c | 21 +++++++++++++++++---- 6 files changed, 102 insertions(+), 36 deletions(-)