Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755974AbYGaQlL (ORCPT ); Thu, 31 Jul 2008 12:41:11 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752737AbYGaQkz (ORCPT ); Thu, 31 Jul 2008 12:40:55 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.122]:37444 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752303AbYGaQky (ORCPT ); Thu, 31 Jul 2008 12:40:54 -0400 Date: Thu, 31 Jul 2008 12:40:52 -0400 (EDT) From: Steven Rostedt X-X-Sender: rostedt@gandalf.stny.rr.com To: LKML , stable@kernel.org cc: Linus Torvalds , Andrew Morton , Ingo Molnar , Thomas Gleixner , Peter Zijlstra , greg@kroah.com, Chris Wright , Jonathan Corbet , Christoph Hellwig Subject: [PATCH] dual license ftrace.txt In-Reply-To: <20080731093039.4afcb734@bike.lwn.net> Message-ID: References: <20080731093039.4afcb734@bike.lwn.net> User-Agent: Alpine 1.10 (DEB 962 2008-03-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1298 Lines: 33 I asked legal about the licensing of ftrace.txt, and they told me that, unless the Documentation directory is specifically set up to handle non GPL licenses (which it does not appear to be), then it would be best to put ftrace.txt under the GPL. This patch adds a dual license to ftrace.txt such that it is under both the FDL and the GPL. Signed-off-by: Steven Rostedt --- Documentation/ftrace.txt | 1 + 1 file changed, 1 insertion(+) Index: linux-2.6.26/Documentation/ftrace.txt =================================================================== --- linux-2.6.26.orig/Documentation/ftrace.txt 2008-07-31 12:29:23.000000000 -0400 +++ linux-2.6.26/Documentation/ftrace.txt 2008-07-31 12:31:04.000000000 -0400 @@ -4,6 +4,7 @@ Copyright 2008 Red Hat Inc. Author: Steven Rostedt License: The GNU Free Documentation License, Version 1.2 + (dual licensed under the GPL v2) Reviewers: Elias Oltmanns, Randy Dunlap, Andrew Morton, John Kacur, and David Teigland. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/