[ltt-dev] [PATCH 7/6] api: adjust license

[Mathieu Desnoyers]

* Paolo Bonzini (pbonzini at redhat.com) wrote:
> The Linux kernel code is probably not copyrightable anymore.

What do you mean ? If there is still code taken from the Linux kernel in
this api.h test file, we need to keep the licensing comment as-is.

Thanks,

Mathieu

> ---
>  tests/api.h |   11 +++--------
>  1 files changed, 3 insertions(+), 8 deletions(-)
> 
> diff --git a/tests/api.h b/tests/api.h
> index a8193ad..344556f 100644
> --- a/tests/api.h
> +++ b/tests/api.h
> @@ -9,8 +9,8 @@
>   *
>   * 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; but version 2 of the License only due
> - * to code included from the Linux kernel.
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
>   *
>   * This program is distributed in the hope that it will be useful,
>   * but WITHOUT ANY WARRANTY; without even the implied warranty of
> @@ -22,9 +22,6 @@
>   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
>   *
>   * Copyright (c) 2006 Paul E. McKenney, IBM.
> - *
> - * Much code taken from the Linux kernel.  For such code, the option
> - * to redistribute under later versions of GPL might not be available.
>   */
>  
>  #include <urcu/compiler.h>
> @@ -44,9 +41,7 @@
>   * 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.  However, please note that much
> - * of the code in this file derives from the Linux kernel, and that such
> - * code may not be available except under GPLv2.
> + * (at your option) any later version.
>   *
>   * This program is distributed in the hope that it will be useful,
>   * but WITHOUT ANY WARRANTY; without even the implied warranty of
> -- 
> 1.7.6
> 
> 
> _______________________________________________
> ltt-dev mailing list
> ltt-dev at lists.casi.polymtl.ca
> http://lists.casi.polymtl.ca/cgi-bin/mailman/listinfo/ltt-dev
> 

-- 
Mathieu Desnoyers
Operating System Efficiency R&D Consultant
EfficiOS Inc.
http://www.efficios.com