Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f3ca893 authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman
Browse files

staging:lustre: Update license and copyright for the LNET headers 



Point to the right place for GNU license. Update Intel copyright.

Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 188acc61

drivers/staging/lustre/include/linux/lnet/api.h

+5 −8
Original line number Diff line number Diff line
@@ -15,21 +15,19 @@ 
 *

 * 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

 */

/*

 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

 * Use is subject to license terms.

 *

 * Copyright (c) 2011 - 2015, Intel Corporation.

 */

/*

 * This file is part of Lustre, http://www.lustre.org/

 * Lustre is a trademark of Sun Microsystems, Inc.

 * Lustre is a trademark of Seagate, Inc.

 */



#ifndef __LNET_API_H__
@@ -41,9 +39,8 @@ 
 *

 * LNet is an asynchronous message-passing API, which provides an unreliable

 * connectionless service that can't guarantee any order. It supports OFA IB,

 * TCP/IP, and Cray Portals, and routes between heterogeneous networks.

 * TCP/IP, and Cray Interconnects, and routes between heterogeneous networks.

 *

 * LNet can run both in OS kernel space and in userspace as a library.

 * @{

 */

drivers/staging/lustre/include/linux/lnet/lib-lnet.h

+3 −7
Original line number Diff line number Diff line
@@ -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,11 +23,11 @@ 
 * Copyright (c) 2003, 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.

 * Lustre is a trademark of Seagate, Inc.

 *

 * lnet/include/lnet/lib-lnet.h

 */

drivers/staging/lustre/include/linux/lnet/lib-types.h

+3 −10
Original line number Diff line number Diff line
@@ -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,16 +23,13 @@ 
 * Copyright (c) 2003, 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.

 * Lustre is a trademark of Seagate, Inc.

 *

 * lnet/include/lnet/lib-types.h

 *

 * Types used by the library side routines that do not need to be

 * exposed to the user application

 */



#ifndef __LNET_LIB_TYPES_H__

drivers/staging/lustre/include/linux/lnet/lnet.h

+4 −6
Original line number Diff line number Diff line
@@ -15,21 +15,19 @@ 
 *

 * 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

 */

/*

 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

 * Use is subject to license terms.

 *

 * Copyright (c) 2012 - 2015, Intel Corporation.

 */

/*

 * This file is part of Lustre, http://www.lustre.org/

 * Lustre is a trademark of Sun Microsystems, Inc.

 * Lustre is a trademark of Seagate, Inc.

 */



#ifndef __LNET_H__

drivers/staging/lustre/include/linux/lnet/lnetst.h

+4 −8
Original line number Diff line number Diff line
@@ -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,15 +23,15 @@ 
 * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

 * Use is subject to license terms.

 *

 * Copyright (c) 2011, Intel Corporation.

 * Copyright (c) 2011 - 2015, Intel Corporation.

 */

/*

 * This file is part of Lustre, http://www.lustre.org/

 * Lustre is a trademark of Sun Microsystems, Inc.

 * Lustre is a trademark of Seagate, Inc.

 *

 * lnet/include/lnet/lnetst.h

 *

 * Author: Liang Zhen <liangzhen@clusterfs.com>

 * Author: Liang Zhen <liang.zhen@intel.com>

 */



#ifndef __LNET_ST_H__