LU-14487 lustre: remove references to Sun Trademark.

"lustre" is no longer a Trademark of Sun Microsystems.  There is no
need to acknowledge the trademark is every file, so just remove all
these claims.

Test-Parameters: trivial
Signed-off-by: Mr NeilBrown <neilb@suse.de>
Change-Id: I214670b39c5718f2b691193f268a64856e0cd743
Reviewed-on: https://review.whamcloud.com/41880
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>

diff --git a/lustre-iokit/obdfilter-survey/iokit-libecho b/lustre-iokit/obdfilter-survey/iokit-libecho
index a155d4b..dc4e035 100644 (file)
--- a/lustre-iokit/obdfilter-survey/iokit-libecho
+++ b/lustre-iokit/obdfilter-survey/iokit-libecho
@@ -28,7 +28,6 @@
 # Copyright (c) 2012, 2017, Intel Corporation.
 #
 # This file is part of Lustre, http://www.lustre.org/
 # Copyright (c) 2012, 2017, Intel Corporation.
 #
 # This file is part of Lustre, http://www.lustre.org/

-# Lustre is a trademark of Sun Microsystems, Inc.

 #
 # Author: Jitendra Pawar <jitendra@clusterfs.com>
 
 #
 # Author: Jitendra Pawar <jitendra@clusterfs.com>
 

diff --git a/lustre-iokit/obdfilter-survey/iokit-plot-obdfilter b/lustre-iokit/obdfilter-survey/iokit-plot-obdfilter
index 10f84cb..b29761a 100644 (file)
--- a/lustre-iokit/obdfilter-survey/iokit-plot-obdfilter
+++ b/lustre-iokit/obdfilter-survey/iokit-plot-obdfilter
@@ -25,7 +25,6 @@
 # Copyright (c) 2013, 2014, Intel Corporation.
 #
 # This file is part of Lustre, http://www.lustre.org/
 # Copyright (c) 2013, 2014, Intel Corporation.
 #
 # This file is part of Lustre, http://www.lustre.org/

-# Lustre is a trademark of Sun Microsystems, Inc.

 #
 # Author: Jitendra Pawar <jitendra@clusterfs.com>
 
 #
 # Author: Jitendra Pawar <jitendra@clusterfs.com>
 

diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am
index e94ce3d..4e6ed81 100644 (file)
--- a/lustre/autoMakefile.am
+++ b/lustre/autoMakefile.am
@@ -29,7 +29,6 @@
 
 #
 # This file is part of Lustre, http://www.lustre.org/
 
 #
 # This file is part of Lustre, http://www.lustre.org/

-# Lustre is a trademark of Sun Microsystems, Inc.

 #
 
 AUTOMAKE_OPTIONS = foreign
 #
 
 AUTOMAKE_OPTIONS = foreign

diff --git a/lustre/conf/Makefile.am b/lustre/conf/Makefile.am
index a5ae94c..d9fdde5 100644 (file)
--- a/lustre/conf/Makefile.am
+++ b/lustre/conf/Makefile.am
@@ -29,7 +29,6 @@
 
 #
 # This file is part of Lustre, http://www.lustre.org/
 
 #
 # This file is part of Lustre, http://www.lustre.org/

-# Lustre is a trademark of Sun Microsystems, Inc.

 #
 
 SUBDIRS = resource
 #
 
 SUBDIRS = resource

diff --git a/lustre/conf/resource/Makefile.am b/lustre/conf/resource/Makefile.am
index 9893881..aa5119d 100644 (file)
--- a/lustre/conf/resource/Makefile.am
+++ b/lustre/conf/resource/Makefile.am
@@ -26,7 +26,6 @@
 
 #
 # This file is part of Lustre, http://www.lustre.org/
 
 #
 # This file is part of Lustre, http://www.lustre.org/

-# Lustre is a trademark of Sun Microsystems, Inc.

 #
 
 EXTRA_DIST = Lustre healthLNET healthLUSTRE
 #
 
 EXTRA_DIST = Lustre healthLNET healthLUSTRE

diff --git a/lustre/doc/Makefile.am b/lustre/doc/Makefile.am
index 4d409ae..70f3837 100644 (file)
--- a/lustre/doc/Makefile.am
+++ b/lustre/doc/Makefile.am
@@ -29,7 +29,6 @@
 
 #
 # This file is part of Lustre, http://www.lustre.org/
 
 #
 # This file is part of Lustre, http://www.lustre.org/

-# Lustre is a trademark of Sun Microsystems, Inc.

 #
 
 MANFILES =                                     \
 #
 
 MANFILES =                                     \

diff --git a/lustre/include/Makefile.am b/lustre/include/Makefile.am
index a0da174..5215445 100644 (file)
--- a/lustre/include/Makefile.am
+++ b/lustre/include/Makefile.am
@@ -29,7 +29,6 @@
 
 #
 # This file is part of Lustre, http://www.lustre.org/
 
 #
 # This file is part of Lustre, http://www.lustre.org/

-# Lustre is a trademark of Sun Microsystems, Inc.

 #
 
 SUBDIRS = lustre uapi/linux/lustre
 #
 
 SUBDIRS = lustre uapi/linux/lustre

diff --git a/lustre/include/cl_object.h b/lustre/include/cl_object.h
index 9849ea2..9a5b506 100644 (file)
--- a/lustre/include/cl_object.h
+++ b/lustre/include/cl_object.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 #ifndef _LUSTRE_CL_OBJECT_H
 #define _LUSTRE_CL_OBJECT_H
  */
 #ifndef _LUSTRE_CL_OBJECT_H
 #define _LUSTRE_CL_OBJECT_H

diff --git a/lustre/include/dt_object.h b/lustre/include/dt_object.h
index 5d3878a..b730151 100644 (file)
--- a/lustre/include/dt_object.h
+++ b/lustre/include/dt_object.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #ifndef __LUSTRE_DT_OBJECT_H
  */
 
 #ifndef __LUSTRE_DT_OBJECT_H

diff --git a/lustre/include/interval_tree.h b/lustre/include/interval_tree.h
index 1598119..9d6f303 100644 (file)
--- a/lustre/include/interval_tree.h
+++ b/lustre/include/interval_tree.h
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/include/interval_tree.h
  *
  *
  * lustre/include/interval_tree.h
  *

diff --git a/lustre/include/lprocfs_status.h b/lustre/include/lprocfs_status.h
index 454b487..c69546c 100644 (file)
--- a/lustre/include/lprocfs_status.h
+++ b/lustre/include/lprocfs_status.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/include/lprocfs_status.h
  *
  *
  * lustre/include/lprocfs_status.h
  *

diff --git a/lustre/include/lu_object.h b/lustre/include/lu_object.h
index 0448b79..dcde639 100644 (file)
--- a/lustre/include/lu_object.h
+++ b/lustre/include/lu_object.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #ifndef __LUSTRE_LU_OBJECT_H
  */
 
 #ifndef __LUSTRE_LU_OBJECT_H

diff --git a/lustre/include/lu_target.h b/lustre/include/lu_target.h
index 2a109b0..5e523af 100644 (file)
--- a/lustre/include/lu_target.h
+++ b/lustre/include/lu_target.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #ifndef _LUSTRE_LU_TARGET_H
  */
 
 #ifndef _LUSTRE_LU_TARGET_H

diff --git a/lustre/include/lustre/Makefile.am b/lustre/include/lustre/Makefile.am
index 9cb97a4..f67189e 100644 (file)
--- a/lustre/include/lustre/Makefile.am
+++ b/lustre/include/lustre/Makefile.am
@@ -29,7 +29,6 @@
 
 #
 # This file is part of Lustre, http://www.lustre.org/
 
 #
 # This file is part of Lustre, http://www.lustre.org/

-# Lustre is a trademark of Sun Microsystems, Inc.

 #
 
 pkginclude_HEADERS = lustreapi.h lustre_user.h liblustreapi.h ll_fiemap.h \
 #
 
 pkginclude_HEADERS = lustreapi.h lustre_user.h liblustreapi.h ll_fiemap.h \

diff --git a/lustre/include/lustre/libiam.h b/lustre/include/lustre/libiam.h
index 9b73278..b0f20f7 100644 (file)
--- a/lustre/include/lustre/libiam.h
+++ b/lustre/include/lustre/libiam.h
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/include/lustre/libiam.h
  *
  *
  * lustre/include/lustre/libiam.h
  *

diff --git a/lustre/include/lustre/liblustreapi.h b/lustre/include/lustre/liblustreapi.h
index ec64bb6..2778a34 100644 (file)
--- a/lustre/include/lustre/liblustreapi.h
+++ b/lustre/include/lustre/liblustreapi.h
@@ -21,7 +21,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 /*
  */
 
 /*

diff --git a/lustre/include/lustre/ll_fiemap.h b/lustre/include/lustre/ll_fiemap.h
index e5466c7..083187b 100644 (file)
--- a/lustre/include/lustre/ll_fiemap.h
+++ b/lustre/include/lustre/ll_fiemap.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/include/lustre/ll_fiemap.h
  *
  *
  * lustre/include/lustre/ll_fiemap.h
  *

diff --git a/lustre/include/lustre/lustre_user.h b/lustre/include/lustre/lustre_user.h
index 9d8f5eb..81bcf6d 100644 (file)
--- a/lustre/include/lustre/lustre_user.h
+++ b/lustre/include/lustre/lustre_user.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/include/lustre/lustre_user.h
  *
  *
  * lustre/include/lustre/lustre_user.h
  *

diff --git a/lustre/include/lustre/lustreapi.h b/lustre/include/lustre/lustreapi.h
index 0b32875..d731aee 100644 (file)
--- a/lustre/include/lustre/lustreapi.h
+++ b/lustre/include/lustre/lustreapi.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #ifndef _LUSTREAPI_H_
  */
 
 #ifndef _LUSTREAPI_H_

diff --git a/lustre/include/lustre_acl.h b/lustre/include/lustre_acl.h
index 487fb8e..166e1bd 100644 (file)
--- a/lustre/include/lustre_acl.h
+++ b/lustre/include/lustre_acl.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/include/lustre_acl.h
  */
  *
  * lustre/include/lustre_acl.h
  */

diff --git a/lustre/include/lustre_compat.h b/lustre/include/lustre_compat.h
index 51994c8..cceefee 100644 (file)
--- a/lustre/include/lustre_compat.h
+++ b/lustre/include/lustre_compat.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #ifndef _LUSTRE_COMPAT_H
  */
 
 #ifndef _LUSTRE_COMPAT_H

diff --git a/lustre/include/lustre_disk.h b/lustre/include/lustre_disk.h
index 4821985..e87d7ee 100644 (file)
--- a/lustre/include/lustre_disk.h
+++ b/lustre/include/lustre_disk.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/include/lustre_disk.h
  *
  *
  * lustre/include/lustre_disk.h
  *

diff --git a/lustre/include/lustre_dlm.h b/lustre/include/lustre_dlm.h
index be307fd..63f9bd6 100644 (file)
--- a/lustre/include/lustre_dlm.h
+++ b/lustre/include/lustre_dlm.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 /** \defgroup LDLM Lustre Distributed Lock Manager
  */
 
 /** \defgroup LDLM Lustre Distributed Lock Manager

diff --git a/lustre/include/lustre_eacl.h b/lustre/include/lustre_eacl.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/lustre/include/lustre_export.h b/lustre/include/lustre_export.h
index baad226..ab01d7e 100644 (file)
--- a/lustre/include/lustre_export.h
+++ b/lustre/include/lustre_export.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 /** \defgroup obd_export PortalRPC export definitions
  *
  */
 /** \defgroup obd_export PortalRPC export definitions
  *

diff --git a/lustre/include/lustre_fid.h b/lustre/include/lustre_fid.h
index af7a9b2..d7388f0 100644 (file)
--- a/lustre/include/lustre_fid.h
+++ b/lustre/include/lustre_fid.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/include/lustre_fid.h
  *
  *
  * lustre/include/lustre_fid.h
  *

diff --git a/lustre/include/lustre_fld.h b/lustre/include/lustre_fld.h
index 3d8288b..cd9036a 100644 (file)
--- a/lustre/include/lustre_fld.h
+++ b/lustre/include/lustre_fld.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #ifndef __LINUX_FLD_H
  */
 
 #ifndef __LINUX_FLD_H

diff --git a/lustre/include/lustre_ha.h b/lustre/include/lustre_ha.h
index 2cb4969..282115e 100644 (file)
--- a/lustre/include/lustre_ha.h
+++ b/lustre/include/lustre_ha.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #ifndef _LUSTRE_HA_H
  */
 
 #ifndef _LUSTRE_HA_H

diff --git a/lustre/include/lustre_handles.h b/lustre/include/lustre_handles.h
index 004bc80..538f427 100644 (file)
--- a/lustre/include/lustre_handles.h
+++ b/lustre/include/lustre_handles.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #ifndef __LUSTRE_HANDLES_H_
  */
 
 #ifndef __LUSTRE_HANDLES_H_

diff --git a/lustre/include/lustre_idmap.h b/lustre/include/lustre_idmap.h
index a8c5a21..35f55eb 100644 (file)
--- a/lustre/include/lustre_idmap.h
+++ b/lustre/include/lustre_idmap.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/lustre/include/lustre_idmap.h
  *
  *
  * lustre/lustre/include/lustre_idmap.h
  *

diff --git a/lustre/include/lustre_import.h b/lustre/include/lustre_import.h
index c4760d9..24f2c16 100644 (file)
--- a/lustre/include/lustre_import.h
+++ b/lustre/include/lustre_import.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 /** \defgroup obd_import PtlRPC import definitions
  * Imports are client-side representation of remote obd target.
  */
 /** \defgroup obd_import PtlRPC import definitions
  * Imports are client-side representation of remote obd target.

diff --git a/lustre/include/lustre_intent.h b/lustre/include/lustre_intent.h
index 76dcd88..5f3a717 100644 (file)
--- a/lustre/include/lustre_intent.h
+++ b/lustre/include/lustre_intent.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #ifndef LUSTRE_INTENT_H
  */
 
 #ifndef LUSTRE_INTENT_H

diff --git a/lustre/include/lustre_lib.h b/lustre/include/lustre_lib.h
index 2b64fae..4d36fcf 100644 (file)
--- a/lustre/include/lustre_lib.h
+++ b/lustre/include/lustre_lib.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/include/lustre_lib.h
  *
  *
  * lustre/include/lustre_lib.h
  *

diff --git a/lustre/include/lustre_mdc.h b/lustre/include/lustre_mdc.h
index 3883993..094b350 100644 (file)
--- a/lustre/include/lustre_mdc.h
+++ b/lustre/include/lustre_mdc.h
@@ -28,7 +28,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/include/lustre_mdc.h
  *
  *
  * lustre/include/lustre_mdc.h
  *

diff --git a/lustre/include/lustre_mds.h b/lustre/include/lustre_mds.h
index c545b63..8c3c010 100644 (file)
--- a/lustre/include/lustre_mds.h
+++ b/lustre/include/lustre_mds.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/include/lustre_mds.h
  *
  *
  * lustre/include/lustre_mds.h
  *

diff --git a/lustre/include/lustre_net.h b/lustre/include/lustre_net.h
index 8e60c92..466e484 100644 (file)
--- a/lustre/include/lustre_net.h
+++ b/lustre/include/lustre_net.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 /** \defgroup PtlRPC Portal RPC and networking module.
  *
  */
 /** \defgroup PtlRPC Portal RPC and networking module.
  *

diff --git a/lustre/include/lustre_osc.h b/lustre/include/lustre_osc.h
index 8e18d61..9bcb313 100644 (file)
--- a/lustre/include/lustre_osc.h
+++ b/lustre/include/lustre_osc.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 /*
  * lustre/include/lustre_osc.h
  */
 /*
  * lustre/include/lustre_osc.h

diff --git a/lustre/include/lustre_req_layout.h b/lustre/include/lustre_req_layout.h
index a023c6b..38fed78 100644 (file)
--- a/lustre/include/lustre_req_layout.h
+++ b/lustre/include/lustre_req_layout.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/include/lustre_req_layout.h
  *
  *
  * lustre/include/lustre_req_layout.h
  *

diff --git a/lustre/include/lustre_sec.h b/lustre/include/lustre_sec.h
index 664c234..5e53d4e 100644 (file)
--- a/lustre/include/lustre_sec.h
+++ b/lustre/include/lustre_sec.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #ifndef _LUSTRE_SEC_H_
  */
 
 #ifndef _LUSTRE_SEC_H_

diff --git a/lustre/include/lvfs.h b/lustre/include/lvfs.h
index 7025155..2ca2f19 100644 (file)
--- a/lustre/include/lvfs.h
+++ b/lustre/include/lvfs.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/include/lvfs.h
  *
  *
  * lustre/include/lvfs.h
  *

diff --git a/lustre/include/md_object.h b/lustre/include/md_object.h
index 8767061..2d762b8 100644 (file)
--- a/lustre/include/md_object.h
+++ b/lustre/include/md_object.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/include/md_object.h
  *
  *
  * lustre/include/md_object.h
  *

diff --git a/lustre/include/obd.h b/lustre/include/obd.h
index 3adc7db..5b95e80 100644 (file)
--- a/lustre/include/obd.h
+++ b/lustre/include/obd.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #ifndef __OBD_H
  */
 
 #ifndef __OBD_H

diff --git a/lustre/include/obd_cache.h b/lustre/include/obd_cache.h
index 3378e5f..128fad7 100644 (file)
--- a/lustre/include/obd_cache.h
+++ b/lustre/include/obd_cache.h
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #ifndef _OBD_CACHE_H__
  */
 
 #ifndef _OBD_CACHE_H__

diff --git a/lustre/include/obd_cksum.h b/lustre/include/obd_cksum.h
index 103905f..8234d0b 100644 (file)
--- a/lustre/include/obd_cksum.h
+++ b/lustre/include/obd_cksum.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #ifndef __OBD_CKSUM
  */
 
 #ifndef __OBD_CKSUM

diff --git a/lustre/include/obd_class.h b/lustre/include/obd_class.h
index 703ffaf..b1fc854 100644 (file)
--- a/lustre/include/obd_class.h
+++ b/lustre/include/obd_class.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 #ifndef __CLASS_OBD_H
 #define __CLASS_OBD_H
  */
 #ifndef __CLASS_OBD_H
 #define __CLASS_OBD_H

diff --git a/lustre/include/obd_support.h b/lustre/include/obd_support.h
index 93e9262..48cb678 100644 (file)
--- a/lustre/include/obd_support.h
+++ b/lustre/include/obd_support.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #ifndef _OBD_SUPPORT
  */
 
 #ifndef _OBD_SUPPORT

diff --git a/lustre/include/obd_target.h b/lustre/include/obd_target.h
index 406f408..5e52451 100644 (file)
--- a/lustre/include/obd_target.h
+++ b/lustre/include/obd_target.h
@@ -26,7 +26,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #ifndef __OBD_TARGET_H
  */
 
 #ifndef __OBD_TARGET_H

diff --git a/lustre/include/uapi/linux/lustre/lustre_cfg.h b/lustre/include/uapi/linux/lustre/lustre_cfg.h
index 520f3ef..32bf292 100644 (file)
--- a/lustre/include/uapi/linux/lustre/lustre_cfg.h
+++ b/lustre/include/uapi/linux/lustre/lustre_cfg.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #ifndef _UAPI_LUSTRE_CFG_H
  */
 
 #ifndef _UAPI_LUSTRE_CFG_H

diff --git a/lustre/include/uapi/linux/lustre/lustre_disk.h b/lustre/include/uapi/linux/lustre/lustre_disk.h
index 458eb3a..73f800c 100644 (file)
--- a/lustre/include/uapi/linux/lustre/lustre_disk.h
+++ b/lustre/include/uapi/linux/lustre/lustre_disk.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * Lustre disk format definitions.
  *
  *
  * Lustre disk format definitions.
  *

diff --git a/lustre/include/uapi/linux/lustre/lustre_fiemap.h b/lustre/include/uapi/linux/lustre/lustre_fiemap.h
index ddea799..8204cd9 100644 (file)
--- a/lustre/include/uapi/linux/lustre/lustre_fiemap.h
+++ b/lustre/include/uapi/linux/lustre/lustre_fiemap.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * FIEMAP data structures and flags. This header file will be used until
  * fiemap.h is available in the upstream kernel.
  *
  * FIEMAP data structures and flags. This header file will be used until
  * fiemap.h is available in the upstream kernel.

diff --git a/lustre/include/uapi/linux/lustre/lustre_idl.h b/lustre/include/uapi/linux/lustre/lustre_idl.h
index c36b710..0970619 100644 (file)
--- a/lustre/include/uapi/linux/lustre/lustre_idl.h
+++ b/lustre/include/uapi/linux/lustre/lustre_idl.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * Lustre wire protocol definitions.
  */
  *
  * Lustre wire protocol definitions.
  */

diff --git a/lustre/include/uapi/linux/lustre/lustre_param.h b/lustre/include/uapi/linux/lustre/lustre_param.h
index 022d253..284c63b 100644 (file)
--- a/lustre/include/uapi/linux/lustre/lustre_param.h
+++ b/lustre/include/uapi/linux/lustre/lustre_param.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * User-settable parameter keys
  *
  *
  * User-settable parameter keys
  *

diff --git a/lustre/include/uapi/linux/lustre/lustre_user.h b/lustre/include/uapi/linux/lustre/lustre_user.h
index 4d697d6..7e79f3f 100644 (file)
--- a/lustre/include/uapi/linux/lustre/lustre_user.h
+++ b/lustre/include/uapi/linux/lustre/lustre_user.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/include/lustre/lustre_user.h
  *
  *
  * lustre/include/lustre/lustre_user.h
  *

diff --git a/lustre/include/upcall_cache.h b/lustre/include/upcall_cache.h
index 1f02294..6ac4a40 100644 (file)
--- a/lustre/include/upcall_cache.h
+++ b/lustre/include/upcall_cache.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #ifndef _UPCALL_CACHE_H
  */
 
 #ifndef _UPCALL_CACHE_H

diff --git a/lustre/scripts/Makefile.am b/lustre/scripts/Makefile.am
index 7a3232b..6db837c 100644 (file)
--- a/lustre/scripts/Makefile.am
+++ b/lustre/scripts/Makefile.am
@@ -29,7 +29,6 @@
 
 #
 # This file is part of Lustre, http://www.lustre.org/
 
 #
 # This file is part of Lustre, http://www.lustre.org/

-# Lustre is a trademark of Sun Microsystems, Inc.

 #
 
 # These are scripts that are generated from .in files
 #
 
 # These are scripts that are generated from .in files

diff --git a/lustre/tests/checkstat.c b/lustre/tests/checkstat.c
index 37466e0..203ff02 100644 (file)
--- a/lustre/tests/checkstat.c
+++ b/lustre/tests/checkstat.c
@@ -32,7 +32,6 @@
  * stat(3) should be used in all new tests.
  *
  * This file is part of Lustre, http://www.lustre.org/
  * stat(3) should be used in all new tests.
  *
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

diff --git a/lustre/tests/chownmany.c b/lustre/tests/chownmany.c
index 119e963..c01e99c 100644 (file)
--- a/lustre/tests/chownmany.c
+++ b/lustre/tests/chownmany.c
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

diff --git a/lustre/tests/createtest.c b/lustre/tests/createtest.c
index 17008a8..15146f5 100644 (file)
--- a/lustre/tests/createtest.c
+++ b/lustre/tests/createtest.c
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

diff --git a/lustre/tests/directio.c b/lustre/tests/directio.c
index 5e57d0f..32a76fd 100644 (file)
--- a/lustre/tests/directio.c
+++ b/lustre/tests/directio.c
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #ifndef _GNU_SOURCE
  */
 
 #ifndef _GNU_SOURCE

diff --git a/lustre/tests/flocks_test.c b/lustre/tests/flocks_test.c
index 2716be3..e6fc12e 100644 (file)
--- a/lustre/tests/flocks_test.c
+++ b/lustre/tests/flocks_test.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #include <errno.h>
  */
 
 #include <errno.h>

diff --git a/lustre/tests/kernel/autoMakefile.am b/lustre/tests/kernel/autoMakefile.am
index 9309582..7cf533d 100644 (file)
--- a/lustre/tests/kernel/autoMakefile.am
+++ b/lustre/tests/kernel/autoMakefile.am
@@ -22,7 +22,6 @@
 
 #
 # This file is part of Lustre, http://www.lustre.org/
 
 #
 # This file is part of Lustre, http://www.lustre.org/

-# Lustre is a trademark of Sun Microsystems, Inc.

 #
 
 if MODULES
 #
 
 if MODULES

diff --git a/lustre/tests/ll_dirstripe_verify.c b/lustre/tests/ll_dirstripe_verify.c
index 379708b..3a26e67 100644 (file)
--- a/lustre/tests/ll_dirstripe_verify.c
+++ b/lustre/tests/ll_dirstripe_verify.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/tests/ll_dirstripe_verify.c
  *
  *
  * lustre/tests/ll_dirstripe_verify.c
  *

diff --git a/lustre/tests/ll_sparseness_verify.c b/lustre/tests/ll_sparseness_verify.c
index 1cede94..fb954da 100644 (file)
--- a/lustre/tests/ll_sparseness_verify.c
+++ b/lustre/tests/ll_sparseness_verify.c
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/tests/ll_sparseness_verify.c
  *
  *
  * lustre/tests/ll_sparseness_verify.c
  *

diff --git a/lustre/tests/ll_sparseness_write.c b/lustre/tests/ll_sparseness_write.c
index 849e97c..c0d1bd5 100644 (file)
--- a/lustre/tests/ll_sparseness_write.c
+++ b/lustre/tests/ll_sparseness_write.c
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #ifndef _GNU_SOURCE
  */
 
 #ifndef _GNU_SOURCE

diff --git a/lustre/tests/mcreate.c b/lustre/tests/mcreate.c
index 39ddba5..ce88321 100644 (file)
--- a/lustre/tests/mcreate.c
+++ b/lustre/tests/mcreate.c
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

diff --git a/lustre/tests/memhog.c b/lustre/tests/memhog.c
index a98e88f..752bb2a 100644 (file)
--- a/lustre/tests/memhog.c
+++ b/lustre/tests/memhog.c
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #include <sys/types.h>
  */
 
 #include <sys/types.h>

diff --git a/lustre/tests/mkdirmany.c b/lustre/tests/mkdirmany.c
index 6602a94..8a57df7 100644 (file)
--- a/lustre/tests/mkdirmany.c
+++ b/lustre/tests/mkdirmany.c
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

diff --git a/lustre/tests/mlink.c b/lustre/tests/mlink.c
index aa36d46..80aa672 100644 (file)
--- a/lustre/tests/mlink.c
+++ b/lustre/tests/mlink.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

diff --git a/lustre/tests/mmap_cat.c b/lustre/tests/mmap_cat.c
index c739670..ca2e55e 100644 (file)
--- a/lustre/tests/mmap_cat.c
+++ b/lustre/tests/mmap_cat.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

diff --git a/lustre/tests/mmap_mknod_test.c b/lustre/tests/mmap_mknod_test.c
index 6a70987..d1be8de 100644 (file)
--- a/lustre/tests/mmap_mknod_test.c
+++ b/lustre/tests/mmap_mknod_test.c
@@ -29,7 +29,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

diff --git a/lustre/tests/mmap_sanity.c b/lustre/tests/mmap_sanity.c
index ae51136..6b17d52 100644 (file)
--- a/lustre/tests/mmap_sanity.c
+++ b/lustre/tests/mmap_sanity.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #include <sys/types.h>
  */
 
 #include <sys/types.h>

diff --git a/lustre/tests/mpi/cascading_rw.c b/lustre/tests/mpi/cascading_rw.c
index 1de1a69..6c9d4f6 100644 (file)
--- a/lustre/tests/mpi/cascading_rw.c
+++ b/lustre/tests/mpi/cascading_rw.c
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/tests/mpi/cascading_rw.c
  *
  *
  * lustre/tests/mpi/cascading_rw.c
  *

diff --git a/lustre/tests/mpi/createmany-mpi.c b/lustre/tests/mpi/createmany-mpi.c
index 27e34bf..3ef7566 100644 (file)
--- a/lustre/tests/mpi/createmany-mpi.c
+++ b/lustre/tests/mpi/createmany-mpi.c
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

diff --git a/lustre/tests/mpi/lp_utils.c b/lustre/tests/mpi/lp_utils.c
index 8bcb555..a7c4024 100644 (file)
--- a/lustre/tests/mpi/lp_utils.c
+++ b/lustre/tests/mpi/lp_utils.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/tests/lp_utils.c
  *
  *
  * lustre/tests/lp_utils.c
  *

diff --git a/lustre/tests/mpi/lp_utils.h b/lustre/tests/mpi/lp_utils.h
index fc67ba5..2963898 100644 (file)
--- a/lustre/tests/mpi/lp_utils.h
+++ b/lustre/tests/mpi/lp_utils.h
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/tests/lp_utils.h
  *
  *
  * lustre/tests/lp_utils.h
  *

diff --git a/lustre/tests/mpi/parallel_grouplock.c b/lustre/tests/mpi/parallel_grouplock.c
index 1ece6e2..f99e2de 100644 (file)
--- a/lustre/tests/mpi/parallel_grouplock.c
+++ b/lustre/tests/mpi/parallel_grouplock.c
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/tests/parallel_grouplock.c
  *
  *
  * lustre/tests/parallel_grouplock.c
  *

diff --git a/lustre/tests/mpi/write_append_truncate.c b/lustre/tests/mpi/write_append_truncate.c
index 7e8436f..6296646 100644 (file)
--- a/lustre/tests/mpi/write_append_truncate.c
+++ b/lustre/tests/mpi/write_append_truncate.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/tests/write_append_truncate.c
  *
  *
  * lustre/tests/write_append_truncate.c
  *

diff --git a/lustre/tests/mpi/write_disjoint.c b/lustre/tests/mpi/write_disjoint.c
index 7848412..2b045fe 100644 (file)
--- a/lustre/tests/mpi/write_disjoint.c
+++ b/lustre/tests/mpi/write_disjoint.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/tests/write_disjoint.c
  *
  *
  * lustre/tests/write_disjoint.c
  *

diff --git a/lustre/tests/mrename.c b/lustre/tests/mrename.c
index 4031f55..987007e 100644 (file)
--- a/lustre/tests/mrename.c
+++ b/lustre/tests/mrename.c
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #include <stdlib.h>
  */
 
 #include <stdlib.h>

diff --git a/lustre/tests/multifstat.c b/lustre/tests/multifstat.c
index cffa54b..9ed04df 100644 (file)
--- a/lustre/tests/multifstat.c
+++ b/lustre/tests/multifstat.c
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

diff --git a/lustre/tests/multiop.c b/lustre/tests/multiop.c
index 70b61d8..100d014 100644 (file)
--- a/lustre/tests/multiop.c
+++ b/lustre/tests/multiop.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #ifndef _GNU_SOURCE
  */
 
 #ifndef _GNU_SOURCE

diff --git a/lustre/tests/munlink.c b/lustre/tests/munlink.c
index 80778a7..0b8e253 100644 (file)
--- a/lustre/tests/munlink.c
+++ b/lustre/tests/munlink.c
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

diff --git a/lustre/tests/opendevunlink.c b/lustre/tests/opendevunlink.c
index 738794b..d2ce365 100644 (file)
--- a/lustre/tests/opendevunlink.c
+++ b/lustre/tests/opendevunlink.c
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #ifndef _GNU_SOURCE
  */
 
 #ifndef _GNU_SOURCE

diff --git a/lustre/tests/opendirunlink.c b/lustre/tests/opendirunlink.c
index 5fe38a5..3d9d2bf 100644 (file)
--- a/lustre/tests/opendirunlink.c
+++ b/lustre/tests/opendirunlink.c
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 /* for O_DIRECTORY */
  */
 
 /* for O_DIRECTORY */

diff --git a/lustre/tests/openfile.c b/lustre/tests/openfile.c
index b01a415..593e295 100644 (file)
--- a/lustre/tests/openfile.c
+++ b/lustre/tests/openfile.c
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 /* for O_DIRECTORY and O_DIRECT */
  */
 
 /* for O_DIRECTORY and O_DIRECT */

diff --git a/lustre/tests/openfilleddirunlink.c b/lustre/tests/openfilleddirunlink.c
index 1f58972..90b3714 100644 (file)
--- a/lustre/tests/openfilleddirunlink.c
+++ b/lustre/tests/openfilleddirunlink.c
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 /* for O_DIRECTORY */
  */
 
 /* for O_DIRECTORY */

diff --git a/lustre/tests/openunlink.c b/lustre/tests/openunlink.c
index 70768b0..36f4c80 100644 (file)
--- a/lustre/tests/openunlink.c
+++ b/lustre/tests/openunlink.c
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

diff --git a/lustre/tests/reads.c b/lustre/tests/reads.c
index 5085c59..d42dc97 100644 (file)
--- a/lustre/tests/reads.c
+++ b/lustre/tests/reads.c
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/tests/reads.c
  *
  *
  * lustre/tests/reads.c
  *

diff --git a/lustre/tests/rename_many.c b/lustre/tests/rename_many.c
index c67c6dc..719e630 100644 (file)
--- a/lustre/tests/rename_many.c
+++ b/lustre/tests/rename_many.c
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #define PATH_LENGTH 35
  */
 
 #define PATH_LENGTH 35

diff --git a/lustre/tests/runas.c b/lustre/tests/runas.c
index f43dc08..ff799eb 100644 (file)
--- a/lustre/tests/runas.c
+++ b/lustre/tests/runas.c
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

diff --git a/lustre/tests/rwv.c b/lustre/tests/rwv.c
index 331586d..90e9f87 100644 (file)
--- a/lustre/tests/rwv.c
+++ b/lustre/tests/rwv.c
@@ -28,7 +28,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/tests/rwv.c
  */
  *
  * lustre/tests/rwv.c
  */

diff --git a/lustre/tests/sendfile.c b/lustre/tests/sendfile.c
index 3f51155..028f02c 100644 (file)
--- a/lustre/tests/sendfile.c
+++ b/lustre/tests/sendfile.c
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

diff --git a/lustre/tests/small_write.c b/lustre/tests/small_write.c
index 26ac6fe..26c0f94 100644 (file)
--- a/lustre/tests/small_write.c
+++ b/lustre/tests/small_write.c
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

diff --git a/lustre/tests/smalliomany.c b/lustre/tests/smalliomany.c
index c704f01..889f96b 100644 (file)
--- a/lustre/tests/smalliomany.c
+++ b/lustre/tests/smalliomany.c
@@ -31,7 +31,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

diff --git a/lustre/tests/statmany.c b/lustre/tests/statmany.c
index 8a4f82a..fac1921 100644 (file)
--- a/lustre/tests/statmany.c
+++ b/lustre/tests/statmany.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

diff --git a/lustre/tests/statone.c b/lustre/tests/statone.c
index 38a51b2..f17f701 100644 (file)
--- a/lustre/tests/statone.c
+++ b/lustre/tests/statone.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #include <errno.h>
  */
 
 #include <errno.h>

diff --git a/lustre/tests/tchmod.c b/lustre/tests/tchmod.c
index e266584..b0bbc65 100644 (file)
--- a/lustre/tests/tchmod.c
+++ b/lustre/tests/tchmod.c
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #include <sys/types.h>
  */
 
 #include <sys/types.h>

diff --git a/lustre/tests/test_brw.c b/lustre/tests/test_brw.c
index 855ee8e..14e790b 100644 (file)
--- a/lustre/tests/test_brw.c
+++ b/lustre/tests/test_brw.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 /* for O_DIRECT */
  */
 
 /* for O_DIRECT */

diff --git a/lustre/tests/truncate.c b/lustre/tests/truncate.c
index 6ecd3a2..2e6e840 100644 (file)
--- a/lustre/tests/truncate.c
+++ b/lustre/tests/truncate.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #include <errno.h>
  */
 
 #include <errno.h>

diff --git a/lustre/tests/unlinkmany.c b/lustre/tests/unlinkmany.c
index f83ba57..1cc3de5 100644 (file)
--- a/lustre/tests/unlinkmany.c
+++ b/lustre/tests/unlinkmany.c
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

diff --git a/lustre/tests/utime.c b/lustre/tests/utime.c
index 17c37d9..4295e5a 100644 (file)
--- a/lustre/tests/utime.c
+++ b/lustre/tests/utime.c
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/tests/utime.c
  *
  *
  * lustre/tests/utime.c
  *

diff --git a/lustre/tests/write_time_limit.c b/lustre/tests/write_time_limit.c
index 6384cf2..0988f54 100644 (file)
--- a/lustre/tests/write_time_limit.c
+++ b/lustre/tests/write_time_limit.c
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 /* for O_DIRECT */
  */
 
 /* for O_DIRECT */

diff --git a/lustre/tests/writemany.c b/lustre/tests/writemany.c
index 3615500..5790034 100644 (file)
--- a/lustre/tests/writemany.c
+++ b/lustre/tests/writemany.c
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #include <stdlib.h>
  */
 
 #include <stdlib.h>

diff --git a/lustre/tests/writeme.c b/lustre/tests/writeme.c
index 38c7c37..0c9eaf2 100644 (file)
--- a/lustre/tests/writeme.c
+++ b/lustre/tests/writeme.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #include <fcntl.h>
  */
 
 #include <fcntl.h>

diff --git a/lustre/utils/create_iam.c b/lustre/utils/create_iam.c
index 9d08bc0..c0fa50f 100644 (file)
--- a/lustre/utils/create_iam.c
+++ b/lustre/utils/create_iam.c
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/utils/create_iam.c
  *
  *
  * lustre/utils/create_iam.c
  *

diff --git a/lustre/utils/debug.c b/lustre/utils/debug.c
index 2f70540..96bbf1d 100644 (file)
--- a/lustre/utils/debug.c
+++ b/lustre/utils/debug.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lnet/utils/debug.c
  * Some day I'll split all of this functionality into a cfs_debug module
  *
  * lnet/utils/debug.c
  * Some day I'll split all of this functionality into a cfs_debug module

diff --git a/lustre/utils/gss/lgss_keyring.c b/lustre/utils/gss/lgss_keyring.c
index 93fd94c..0225421 100644 (file)
--- a/lustre/utils/gss/lgss_keyring.c
+++ b/lustre/utils/gss/lgss_keyring.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/utils/gss/lgss_keyring.c
  *
  *
  * lustre/utils/gss/lgss_keyring.c
  *

diff --git a/lustre/utils/gss/lsupport.c b/lustre/utils/gss/lsupport.c
index 5c1458f..7bc291b 100644 (file)
--- a/lustre/utils/gss/lsupport.c
+++ b/lustre/utils/gss/lsupport.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #ifndef _GNU_SOURCE
  */
 
 #ifndef _GNU_SOURCE

diff --git a/lustre/utils/gss/lsupport.h b/lustre/utils/gss/lsupport.h
index 30aea86..64871f5 100644 (file)
--- a/lustre/utils/gss/lsupport.h
+++ b/lustre/utils/gss/lsupport.h
@@ -28,7 +28,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/utils/gss/lsupport.h
  */
  *
  * lustre/utils/gss/lsupport.h
  */

diff --git a/lustre/utils/l_getidentity.c b/lustre/utils/l_getidentity.c
index df80258..cd4b041 100644 (file)
--- a/lustre/utils/l_getidentity.c
+++ b/lustre/utils/l_getidentity.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #include <stdbool.h>
  */
 
 #include <stdbool.h>

diff --git a/lustre/utils/lctl.c b/lustre/utils/lctl.c
index 0b09bb1..4c75a48 100644 (file)
--- a/lustre/utils/lctl.c
+++ b/lustre/utils/lctl.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/utils/lctl.c
  *
  *
  * lustre/utils/lctl.c
  *

diff --git a/lustre/utils/lfs.c b/lustre/utils/lfs.c
index f433053..f9ca763 100644 (file)
--- a/lustre/utils/lfs.c
+++ b/lustre/utils/lfs.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/utils/lfs.c
  *
  *
  * lustre/utils/lfs.c
  *

diff --git a/lustre/utils/libiam.c b/lustre/utils/libiam.c
index 9686965..af5472c 100644 (file)
--- a/lustre/utils/libiam.c
+++ b/lustre/utils/libiam.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/utils/libiam.c
  *
  *
  * lustre/utils/libiam.c
  *

diff --git a/lustre/utils/liblustreapi.c b/lustre/utils/liblustreapi.c
index 7e2ffd9..d042424 100644 (file)
--- a/lustre/utils/liblustreapi.c
+++ b/lustre/utils/liblustreapi.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/utils/liblustreapi.c
  *
  *
  * lustre/utils/liblustreapi.c
  *

diff --git a/lustre/utils/libmount_utils_ldiskfs.c b/lustre/utils/libmount_utils_ldiskfs.c
index 3fe870c..c7a6aae 100644 (file)
--- a/lustre/utils/libmount_utils_ldiskfs.c
+++ b/lustre/utils/libmount_utils_ldiskfs.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/utils/mount_utils_ldiskfs.c
  *
  *
  * lustre/utils/mount_utils_ldiskfs.c
  *

diff --git a/lustre/utils/ll_decode_filter_fid.c b/lustre/utils/ll_decode_filter_fid.c
index c1c2b38..971e0d9 100644 (file)
--- a/lustre/utils/ll_decode_filter_fid.c
+++ b/lustre/utils/ll_decode_filter_fid.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/utils/ll_decode_filter_fid.c
  *
  *
  * lustre/utils/ll_decode_filter_fid.c
  *

diff --git a/lustre/utils/llog_reader.c b/lustre/utils/llog_reader.c
index 6b43408..ef59c8b 100644 (file)
--- a/lustre/utils/llog_reader.c
+++ b/lustre/utils/llog_reader.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 /** \defgroup llog_reader Lustre Log Reader
  *
  */
 /** \defgroup llog_reader Lustre Log Reader
  *

diff --git a/lustre/utils/llverdev.c b/lustre/utils/llverdev.c
index 18f7eb5..5295b60 100644 (file)
--- a/lustre/utils/llverdev.c
+++ b/lustre/utils/llverdev.c
@@ -28,7 +28,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/utils/llverdev.c
  *
  *
  * lustre/utils/llverdev.c
  *

diff --git a/lustre/utils/llverfs.c b/lustre/utils/llverfs.c
index a32954f..ed63ea9 100644 (file)
--- a/lustre/utils/llverfs.c
+++ b/lustre/utils/llverfs.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/utils/llverfs.c
  *
  *
  * lustre/utils/llverfs.c
  *

diff --git a/lustre/utils/lr_reader.c b/lustre/utils/lr_reader.c
index f1072a2..f347845 100644 (file)
--- a/lustre/utils/lr_reader.c
+++ b/lustre/utils/lr_reader.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/utils/lr_reader.c
  *
  *
  * lustre/utils/lr_reader.c
  *

diff --git a/lustre/utils/lustre_cfg.c b/lustre/utils/lustre_cfg.c
index 233ff1b..082af0c 100644 (file)
--- a/lustre/utils/lustre_cfg.c
+++ b/lustre/utils/lustre_cfg.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/utils/lustre_cfg.c
  *
  *
  * lustre/utils/lustre_cfg.c
  *

diff --git a/lustre/utils/lustre_rsync.c b/lustre/utils/lustre_rsync.c
index 34e943b..3cac543 100644 (file)
--- a/lustre/utils/lustre_rsync.c
+++ b/lustre/utils/lustre_rsync.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/utils/lustre_rsync.c
  *
  *
  * lustre/utils/lustre_rsync.c
  *

diff --git a/lustre/utils/lustre_rsync.h b/lustre/utils/lustre_rsync.h
index c9f5eb4..bb95cc1 100644 (file)
--- a/lustre/utils/lustre_rsync.h
+++ b/lustre/utils/lustre_rsync.h
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/include/lustre/lustre_rsync.h
  *
  *
  * lustre/include/lustre/lustre_rsync.h
  *

diff --git a/lustre/utils/mkfs_lustre.c b/lustre/utils/mkfs_lustre.c
index b1f0f58..153a466 100644 (file)
--- a/lustre/utils/mkfs_lustre.c
+++ b/lustre/utils/mkfs_lustre.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/utils/mkfs_lustre.c
  *
  *
  * lustre/utils/mkfs_lustre.c
  *

diff --git a/lustre/utils/mount_lustre.c b/lustre/utils/mount_lustre.c
index 7b363a5..9c266e6 100644 (file)
--- a/lustre/utils/mount_lustre.c
+++ b/lustre/utils/mount_lustre.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/utils/mount_lustre.c
  *
  *
  * lustre/utils/mount_lustre.c
  *

diff --git a/lustre/utils/mount_utils.c b/lustre/utils/mount_utils.c
index 64547eb..c32c565 100644 (file)
--- a/lustre/utils/mount_utils.c
+++ b/lustre/utils/mount_utils.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #if HAVE_CONFIG_H
  */
 
 #if HAVE_CONFIG_H

diff --git a/lustre/utils/mount_utils.h b/lustre/utils/mount_utils.h
index 604483d..b473e01 100644 (file)
--- a/lustre/utils/mount_utils.h
+++ b/lustre/utils/mount_utils.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #ifndef _MOUNT_UTILS_H_
  */
 
 #ifndef _MOUNT_UTILS_H_

diff --git a/lustre/utils/obd.c b/lustre/utils/obd.c
index 1ccaaad..db9242d 100644 (file)
--- a/lustre/utils/obd.c
+++ b/lustre/utils/obd.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * lustre/utils/obd.c
  *
  *
  * lustre/utils/obd.c
  *

diff --git a/lustre/utils/obdctl.h b/lustre/utils/obdctl.h
index 742173a..3787a12 100644 (file)
--- a/lustre/utils/obdctl.h
+++ b/lustre/utils/obdctl.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #ifndef _OBDCTL_H_
  */
 
 #ifndef _OBDCTL_H_

diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c
index 312d37e..c4f550e 100644 (file)
--- a/lustre/utils/wirecheck.c
+++ b/lustre/utils/wirecheck.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

diff --git a/lustre/utils/wirehdr.c b/lustre/utils/wirehdr.c
index ed3e662..cb26f19 100644 (file)
--- a/lustre/utils/wirehdr.c
+++ b/lustre/utils/wirehdr.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #include <errno.h>
  */
 
 #include <errno.h>

diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c
index 80bc3c4..83e07b6 100644 (file)
--- a/lustre/utils/wiretest.c
+++ b/lustre/utils/wiretest.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  */
 
 #include <errno.h>
  */
 
 #include <errno.h>

diff --git a/snmp/lustre-snmp-trap.c b/snmp/lustre-snmp-trap.c
index 0080b90..543ed21 100644 (file)
--- a/snmp/lustre-snmp-trap.c
+++ b/snmp/lustre-snmp-trap.c
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * snmp/lustre-snmp-trap.c
  *
  *
  * snmp/lustre-snmp-trap.c
  *

diff --git a/snmp/lustre-snmp-trap.h b/snmp/lustre-snmp-trap.h
index f546772..8508b44 100644 (file)
--- a/snmp/lustre-snmp-trap.h
+++ b/snmp/lustre-snmp-trap.h
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * snmp/lustre-snmp-trap.h
  *
  *
  * snmp/lustre-snmp-trap.h
  *

diff --git a/snmp/lustre-snmp-util.c b/snmp/lustre-snmp-util.c
index 4482f70..8789331 100644 (file)
--- a/snmp/lustre-snmp-util.c
+++ b/snmp/lustre-snmp-util.c
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * snmp/lustre-snmp-util.c
  *
  *
  * snmp/lustre-snmp-util.c
  *

diff --git a/snmp/lustre-snmp-util.h b/snmp/lustre-snmp-util.h
index e37b215..fb77b28 100644 (file)
--- a/snmp/lustre-snmp-util.h
+++ b/snmp/lustre-snmp-util.h
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * snmp/lustre-snmp-util.h
  *
  *
  * snmp/lustre-snmp-util.h
  *

diff --git a/snmp/lustre-snmp.c b/snmp/lustre-snmp.c
index 3d8bcbc..93d63e6 100644 (file)
--- a/snmp/lustre-snmp.c
+++ b/snmp/lustre-snmp.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * snmp/lustre-snmp.c
  *
  *
  * snmp/lustre-snmp.c
  *

diff --git a/snmp/lustre-snmp.h b/snmp/lustre-snmp.h
index 2660051..9a77c5b 100644 (file)
--- a/snmp/lustre-snmp.h
+++ b/snmp/lustre-snmp.h
@@ -25,7 +25,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/

- * Lustre is a trademark of Sun Microsystems, Inc.

  *
  * snmp/lustre-snmp.h
  *
  *
  * snmp/lustre-snmp.h
  *