LU-2446 build: Update Whamcloud copyright messages for Intel

Update the copyright messages for master branch for Intel.

These are the manual changes required.
Issues addressed:
  The addition of the GPL to two header files
  Updating the Man page copyrights
  Dealing with nonlinear year issues in git
  Removal of a double copyright
  Careful addition of Intel copyrights in a tricky spots

Signed-off-by: Keith Mannthey <keith.mannthey@intel.com>
Change-Id: Iaf8bd9f2a7e38c265c86c477fdf51607c1590b86
Reviewed-on: http://review.whamcloud.com/4948
Tested-by: Hudson
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>

diff --git a/libcfs/include/libcfs/list.h b/libcfs/include/libcfs/list.h
index 27de832..be06e74 100644 (file)
--- a/libcfs/include/libcfs/list.h
+++ b/libcfs/include/libcfs/list.h
@@ -1,3 +1,25 @@
+/*
+ * GPL HEADER START
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License version 2 for more details.  A copy is
+ * included in the COPYING file that accompanied this code.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * GPL HEADER END
+ */
+
 #ifndef __LIBCFS_LIST_H__
 #define __LIBCFS_LIST_H__
 

diff --git a/libcfs/include/libcfs/user-mem.h b/libcfs/include/libcfs/user-mem.h
index 423ba8e..0c8f104 100644 (file)
--- a/libcfs/include/libcfs/user-mem.h
+++ b/libcfs/include/libcfs/user-mem.h
@@ -1,3 +1,25 @@
+/*
+ * GPL HEADER START
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License version 2 for more details.  A copy is
+ * included in the COPYING file that accompanied this code.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * GPL HEADER END
+ */
+
 #ifndef __LIBCFS_USER_MEM_H__
 #define __LIBCFS_USER_MEM_H__
 

diff --git a/lnet/selftest/brw_test.c b/lnet/selftest/brw_test.c
index e002e83..5e4b036 100644 (file)
--- a/lnet/selftest/brw_test.c
+++ b/lnet/selftest/brw_test.c
@@ -26,6 +26,8 @@
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

diff --git a/lustre/contrib/wireshark/packet-lnet.c b/lustre/contrib/wireshark/packet-lnet.c
index 3ebe2c6..f6e06ea 100644 (file)
--- a/lustre/contrib/wireshark/packet-lnet.c
+++ b/lustre/contrib/wireshark/packet-lnet.c
@@ -21,6 +21,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * Copyright (c) 2012, Intel Corporation.
  */
 
 #ifdef HAVE_CONFIG_H

diff --git a/lustre/contrib/wireshark/packet-lustre.c b/lustre/contrib/wireshark/packet-lustre.c
index 6d7edfd..226e787 100644 (file)
--- a/lustre/contrib/wireshark/packet-lustre.c
+++ b/lustre/contrib/wireshark/packet-lustre.c
@@ -21,6 +21,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * Copyright (c) 2012, Intel Corporation.
  */
 
 #ifdef HAVE_CONFIG_H

diff --git a/lustre/doc/lustre.7 b/lustre/doc/lustre.7
index aa716fe..0458de7 100644 (file)
--- a/lustre/doc/lustre.7
+++ b/lustre/doc/lustre.7
@@ -2,6 +2,8 @@
 .\" Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
+.\" Copyright (c) 2012, Intel Corporation.
+.\"
 .TH Lustre 7 "2006 Jun 15" Lustre "A high-performance cluster file system"
 .SH NAME
 Lustre

diff --git a/lustre/doc/mkfs.lustre.8 b/lustre/doc/mkfs.lustre.8
index 9e29ec4..a189849 100644 (file)
--- a/lustre/doc/mkfs.lustre.8
+++ b/lustre/doc/mkfs.lustre.8
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .\" Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 .\"
-.\" Copyright (c) 2011, Whamcloud, Inc.
+.\" Copyright (c) 2011, 2012, Intel Corporation.
 .\"
 .\" This file may be copied under the terms of the GNU Public License.
 .\"

diff --git a/lustre/doc/mount.lustre.8 b/lustre/doc/mount.lustre.8
index 6995de2..4b613cb 100644 (file)
--- a/lustre/doc/mount.lustre.8
+++ b/lustre/doc/mount.lustre.8
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .\" Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 .\"
-.\" Copyright (c) 2012, Whamcloud, Inc.
+.\" Copyright (c) 2011, 2012, Intel Corporation.
 .\"
 .\" This file may be copied under the terms of the GNU Public License v2.
 .\"

diff --git a/lustre/doc/tunefs.lustre.8 b/lustre/doc/tunefs.lustre.8
index c6e9466..57da9a9 100644 (file)
--- a/lustre/doc/tunefs.lustre.8
+++ b/lustre/doc/tunefs.lustre.8
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .\" Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 .\"
-.\" Copyright (c) 2011, Whamcloud, Inc.
+.\" Copyright (c) 2011, 2012, Intel Corporation.
 .\"
 .\" This file may be copied under the terms of the GNU Public License, v2.
 .\"

diff --git a/lustre/fid/lproc_fid.c b/lustre/fid/lproc_fid.c
index fd66e19..be1fd38 100644 (file)
--- a/lustre/fid/lproc_fid.c
+++ b/lustre/fid/lproc_fid.c
@@ -33,8 +33,6 @@
  * This file is part of Lustre, http://www.lustre.org/
  * Lustre is a trademark of Sun Microsystems, Inc.
  *
- * Copyright (c) 2011, 2012, Whamcloud, Inc.
- *
  * lustre/fid/lproc_fid.c
  *
  * Lustre Sequence Manager

diff --git a/lustre/liblustre/llite_cl.c b/lustre/liblustre/llite_cl.c
index d6fc898..be284e9 100644 (file)
--- a/lustre/liblustre/llite_cl.c
+++ b/lustre/liblustre/llite_cl.c
@@ -16,6 +16,8 @@
  *   You should have received a copy of the GNU General Public License
  *   along with Lustre; if not, write to the Free Software
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *   Copyright (c) 2010, 2012, Intel Corporation.
  */
 
 #define DEBUG_SUBSYSTEM S_LLITE

diff --git a/lustre/obdclass/obdo.c b/lustre/obdclass/obdo.c
index e9c0b6c..d958752 100644 (file)
--- a/lustre/obdclass/obdo.c
+++ b/lustre/obdclass/obdo.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, Whamcloud, Inc.
+ * Copyright (c) 2011, 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/