From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:50171) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RHFp5-0004Y7-MF for qemu-devel@nongnu.org; Fri, 21 Oct 2011 10:11:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RHFp3-0008ON-Fn for qemu-devel@nongnu.org; Fri, 21 Oct 2011 10:11:47 -0400 Received: from mail-gx0-f173.google.com ([209.85.161.173]:37089) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RHFp3-0008OC-CR for qemu-devel@nongnu.org; Fri, 21 Oct 2011 10:11:45 -0400 Received: by ggnr5 with SMTP id r5so4741067ggn.4 for ; Fri, 21 Oct 2011 07:11:44 -0700 (PDT) Message-ID: <4EA17D9D.5010801@codemonkey.ws> Date: Fri, 21 Oct 2011 09:11:41 -0500 From: Anthony Liguori MIME-Version: 1.0 References: <1319205801-17541-1-git-send-email-pbonzini@redhat.com> In-Reply-To: <1319205801-17541-1-git-send-email-pbonzini@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] Mark future contributions to GPLv2-only files as GPLv2+ List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: blauwirbel@gmail.com, qemu-devel@nongnu.org On 10/21/2011 09:03 AM, Paolo Bonzini wrote: > Even for files are licensed GPLv2-only, let's not play catch with > ourselves, and explicitly declare that future contributions to those > files will also be available as "any later version". > > Signed-off-by: Paolo Bonzini > diff --git a/roms/SLOF b/roms/SLOF > index d1d6b53..b94bde0 160000 > --- a/roms/SLOF > +++ b/roms/SLOF > @@ -1 +1 @@ > -Subproject commit d1d6b53b713a2b7c2c25685268fa932d28a4b4c0 > +Subproject commit b94bde008b0d49ec4bfe933e110d0952d032ac28 I think you made a mistake here. Otherwise I'm a bit concerned about ambiguity here. Let's say we have to backport a fit to stable, we need to pull in this new copyright statement. But then what if we later discovered we need to pull in a fix from before 10/25. That will appear in the stable tree as a post-10/25 commit but it carries a GPLv2 only license. I think a per-file flag day is really the only sane approach to this. Regards, Anthony Liguori > diff --git a/xen-all.c b/xen-all.c > index b5e28ab..4d6bf1a 100644 > --- a/xen-all.c > +++ b/xen-all.c > @@ -4,6 +4,8 @@ > * This work is licensed under the terms of the GNU GPL, version 2. See > * the COPYING file in the top-level directory. > * > + * Contributions after 2011-10-25 are licensed under the terms of the > + * GNU GPL, version 2 or (at your option) any later version. > */ > > #include > diff --git a/xen-mapcache.c b/xen-mapcache.c > index 7bcb86e..f66bc60 100644 > --- a/xen-mapcache.c > +++ b/xen-mapcache.c > @@ -4,6 +4,8 @@ > * This work is licensed under the terms of the GNU GPL, version 2. See > * the COPYING file in the top-level directory. > * > + * Contributions after 2011-10-25 are licensed under the terms of the > + * GNU GPL, version 2 or (at your option) any later version. > */ > > #include "config.h" > diff --git a/xen-stub.c b/xen-stub.c > index efe2ab5..d713750 100644 > --- a/xen-stub.c > +++ b/xen-stub.c > @@ -4,6 +4,8 @@ > * This work is licensed under the terms of the GNU GPL, version 2. See > * the COPYING file in the top-level directory. > * > + * Contributions after 2011-10-25 are licensed under the terms of the > + * GNU GPL, version 2 or (at your option) any later version. > */ > > #include "qemu-common.h"