[lustre-devel] [PATCH 5/5] staging:lustre: Update license and copyright for kernel comm

[lustre-devel] [PATCH 5/5] staging:lustre: Update license and copyright for kernel comm

[James Simmons]

From: frank zago <fzago@cray.com>

Point to the right place for GNU license. Update Intel copyright.
Update Nathan Rutmans email address. This was broken out of the
original patch 14270.

Signed-off-by: frank zago <fzago@cray.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6245
Reviewed-on: http://review.whamcloud.com/14270
Reviewed-by: Nathan Rutman <nathan.rutman@seagate.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
---
 .../lustre/lustre/include/lustre_kernelcomm.h      |    2 +-
 .../lustre/lustre/include/uapi_kernelcomm.h        |    2 +-
 .../staging/lustre/lustre/obdclass/kernelcomm.c    |   11 +++--------
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/lustre/lustre/include/lustre_kernelcomm.h b/drivers/staging/lustre/lustre/include/lustre_kernelcomm.h
index a5baa80..a61263f 100644
--- a/drivers/staging/lustre/lustre/include/lustre_kernelcomm.h
+++ b/drivers/staging/lustre/lustre/include/lustre_kernelcomm.h
@@ -28,7 +28,7 @@
 /*
  * This file is part of Lustre, http://www.lustre.org/
  *
- * Author: Nathan Rutman <nathan.rutman@sun.com>
+ * Author: Nathan Rutman <nathan.rutman@seagate.com>
  *
  * Kernel <-> userspace communication routines.
  * The definitions below are used in the kernel and userspace.
diff --git a/drivers/staging/lustre/lustre/include/uapi_kernelcomm.h b/drivers/staging/lustre/lustre/include/uapi_kernelcomm.h
index 5e0b8de..ad608b7 100644
--- a/drivers/staging/lustre/lustre/include/uapi_kernelcomm.h
+++ b/drivers/staging/lustre/lustre/include/uapi_kernelcomm.h
@@ -28,7 +28,7 @@
 /*
  * This file is part of Lustre, http://www.lustre.org/
  *
- * Author: Nathan Rutman <nathan.rutman@sun.com>
+ * Author: Nathan Rutman <nathan.rutman@seagate.com>
  *
  * Kernel <-> userspace communication routines.
  * The definitions below are used in the kernel and userspace.
diff --git a/drivers/staging/lustre/lustre/obdclass/kernelcomm.c b/drivers/staging/lustre/lustre/obdclass/kernelcomm.c
index 70bd729..978191a 100644
--- a/drivers/staging/lustre/lustre/obdclass/kernelcomm.c
+++ b/drivers/staging/lustre/lustre/obdclass/kernelcomm.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,13 +23,12 @@
  * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  *
- * Author: Nathan Rutman <nathan.rutman@sun.com>
+ * Author: Nathan Rutman <nathan.rutman@seagate.com>
  *
  * Kernel <-> userspace communication routines.
  * Using pipes for all arches.
-- 
1.7.1

[lustre-devel] [PATCH 5/5] staging:lustre: Update license and copyright for kernel comm

[Xose Vazquez Perez]

James Simmons wrote:

> From: frank zago <fzago@cray.com>
> 
> Point to the right place for GNU license. Update Intel copyright.
> Update Nathan Rutmans email address. This was broken out of the
> original patch 14270.
>
> [...]
>
> - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
> - *
> - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
> - * CA 95054 USA or visit www.sun.com if you need additional information or
> - * have any questions.

That text is in every files. You should kill all references.

-thanks-

[lustre-devel] [PATCH 5/5] staging:lustre: Update license and copyright for kernel comm

[Simmons, James A.]

>>
>> - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
>> - *
>> - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
>> - * CA 95054 USA or visit www.sun.com if you need additional information or
>> - * have any questions.
>
>That text is in every files. You should kill all references.

That would be a mighty big patch.  A patch already exist in our development branch
to update the copyright so that will be eventually backported to the staging tree.
I can look into updating the rest after the copyright patch lands. Then I will port to the
staging tree.

[lustre-devel] [PATCH 5/5] staging:lustre: Update license and copyright for kernel comm

[Greg KH]

On Wed, Oct 28, 2015 at 07:00:29PM +0000, Simmons, James A. wrote:
> >>
> >> - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
> >> - *
> >> - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
> >> - * CA 95054 USA or visit www.sun.com if you need additional information or
> >> - * have any questions.
> >
> >That text is in every files. You should kill all references.
> 
> That would be a mighty big patch.

I can take "mighty big patches" like this quite easily, please send it
to me, don't mess with this "development branch of an external tree"
nonsense, which I'm _REALLY_ getting tired of.

Please drop that tree and only use the in-kernel version.  If that
doesn't work for you, then we need to drop the in-kernel version as it's
pretty obvious no one is actually using this in-kernel code.

thanks,

greg k-h