mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Theodore Ts'o" <tytso@mit.edu>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Adrian Bunk <bunk@stusta.de>,
	linux-kernel@vger.kernel.org, Jason.Jorgensen@comtrol.com,
	Keith.Hammerbeck@comtrol.com, Steve.Erler@comtrol.com
Subject: Re: Licencing of drivers/char/rocket.c ?
Date: Wed, 10 Nov 2004 12:54:40 -0500	[thread overview]
Message-ID: <20041110175440.GA10178@thunk.org> (raw)
In-Reply-To: <8CA8D92FACEB5447AB1ABA12B13A54CE9F2E88@exchange-2.comtrol.com>

On Tue, Nov 09, 2004 at 01:38:11PM -0600, Jason.Jorgensen@comtrol.com wrote:
> On Tuesday, November 09, 2004 10:58 AM, Theodore Ts'o <tytso@mit.edu> wrote:
>> I developed the Rocketport device driver under contract of Comtrol,
>> with the understanding that the resulting device driver would be
>> released under the GPL.  So I believe the correct way of resolving the
>> conflicting copyright statements is to delete the following lines.
>> 
>> It would be good to get positive confirmation from Comtrol as well
>> that this is their understanding as well.  
>
> You are absolutely correct. That notice slipped by us and should not be in
> there. 
> 
> If someone with access to the mainline source could remove that for us we
> would appreciate it. 

Signed-off-by: "Theodore Ts'o" <tytso@thunk.org>
Acked-by: Jason.Jorgensen@comtrol.com

							- Ted

--- 1.46/drivers/char/rocket.c	2004-10-21 13:03:21 -04:00
+++ edited/rocket.c	2004-11-10 12:49:44 -05:00
@@ -2453,30 +2453,6 @@
 }
 #endif
 
-/***********************************************************************
-		Copyright 1994 Comtrol Corporation.
-			All Rights Reserved.
-
-The following source code is subject to Comtrol Corporation's
-Developer's License Agreement.
-
-This source code is protected by United States copyright law and 
-international copyright treaties.
-
-This source code may only be used to develop software products that
-will operate with Comtrol brand hardware.
-
-You may not reproduce nor distribute this source code in its original
-form but must produce a derivative work which includes portions of
-this source code only.
-
-The portions of this source code which you use in your derivative
-work must bear Comtrol's copyright notice:
-
-		Copyright 1994 Comtrol Corporation.
-
-***********************************************************************/
-
 #ifndef TRUE
 #define TRUE 1
 #endif


       reply	other threads:[~2004-11-10 17:58 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <8CA8D92FACEB5447AB1ABA12B13A54CE9F2E88@exchange-2.comtrol.com>
2004-11-10 17:54 ` Theodore Ts'o [this message]
2004-11-06 23:52 Adrian Bunk
2004-11-09 16:58 ` Theodore Ts'o

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20041110175440.GA10178@thunk.org \
    --to=tytso@mit.edu \
    --cc=Jason.Jorgensen@comtrol.com \
    --cc=Keith.Hammerbeck@comtrol.com \
    --cc=Steve.Erler@comtrol.com \
    --cc=bunk@stusta.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@osdl.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome