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

Commit a9474917 authored by Sean Hefty's avatar Sean Hefty Committed by Roland Dreier
Browse files

RDMA: Fix license text 



The license text for several files references a third software license
that was inadvertently copied in.  Update the license to what was
intended.  This update was based on a request from HP.

Signed-off-by: default avatarSean Hefty <sean.hefty@intel.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 929555a2

drivers/infiniband/core/addr.c

+23 −18
Original line number Diff line number Diff line
@@ -4,28 +4,33 @@ 
 * Copyright (c) 1999-2005, Mellanox Technologies, Inc. All rights reserved.

 * Copyright (c) 2005 Intel Corporation.  All rights reserved.

 *

 * This Software is licensed under one of the following licenses:

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU

 * General Public License (GPL) Version 2, available from the file

 * COPYING in the main directory of this source tree, or the

 * OpenIB.org BSD license below:

 *

 * 1) under the terms of the "Common Public License 1.0" a copy of which is

 *    available from the Open Source Initiative, see

 *    http://www.opensource.org/licenses/cpl.php.

 *     Redistribution and use in source and binary forms, with or

 *     without modification, are permitted provided that the following

 *     conditions are met:

 *

 * 2) under the terms of the "The BSD License" a copy of which is

 *    available from the Open Source Initiative, see

 *    http://www.opensource.org/licenses/bsd-license.php.

 *      - Redistributions of source code must retain the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer.

 *

 * 3) under the terms of the "GNU General Public License (GPL) Version 2" a

 *    copy of which is available from the Open Source Initiative, see

 *    http://www.opensource.org/licenses/gpl-license.php.

 *      - Redistributions in binary form must reproduce the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer in the documentation and/or other materials

 *        provided with the distribution.

 *

 * Licensee has the right to choose one of the above licenses.

 *

 * Redistributions of source code must retain the above copyright

 * notice and one of the license notices.

 *

 * Redistributions in binary form must reproduce both the above copyright

 * notice, one of the license notices in the documentation

 * and/or other materials provided with the distribution.

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

 * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 */



#include <linux/mutex.h>

drivers/infiniband/core/cma.c

+23 −19
Original line number Diff line number Diff line
@@ -4,29 +4,33 @@ 
 * Copyright (c) 1999-2005, Mellanox Technologies, Inc. All rights reserved.

 * Copyright (c) 2005-2006 Intel Corporation.  All rights reserved.

 *

 * This Software is licensed under one of the following licenses:

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU

 * General Public License (GPL) Version 2, available from the file

 * COPYING in the main directory of this source tree, or the

 * OpenIB.org BSD license below:

 *

 * 1) under the terms of the "Common Public License 1.0" a copy of which is

 *    available from the Open Source Initiative, see

 *    http://www.opensource.org/licenses/cpl.php.

 *     Redistribution and use in source and binary forms, with or

 *     without modification, are permitted provided that the following

 *     conditions are met:

 *

 * 2) under the terms of the "The BSD License" a copy of which is

 *    available from the Open Source Initiative, see

 *    http://www.opensource.org/licenses/bsd-license.php.

 *      - Redistributions of source code must retain the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer.

 *

 * 3) under the terms of the "GNU General Public License (GPL) Version 2" a

 *    copy of which is available from the Open Source Initiative, see

 *    http://www.opensource.org/licenses/gpl-license.php.

 *

 * Licensee has the right to choose one of the above licenses.

 *

 * Redistributions of source code must retain the above copyright

 * notice and one of the license notices.

 *

 * Redistributions in binary form must reproduce both the above copyright

 * notice, one of the license notices in the documentation

 * and/or other materials provided with the distribution.

 *      - Redistributions in binary form must reproduce the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer in the documentation and/or other materials

 *        provided with the distribution.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

 * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 */



#include <linux/completion.h>

include/rdma/ib_addr.h

+23 −19
Original line number Diff line number Diff line
@@ -2,29 +2,33 @@ 
 * Copyright (c) 2005 Voltaire Inc.  All rights reserved.

 * Copyright (c) 2005 Intel Corporation.  All rights reserved.

 *

 * This Software is licensed under one of the following licenses:

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU

 * General Public License (GPL) Version 2, available from the file

 * COPYING in the main directory of this source tree, or the

 * OpenIB.org BSD license below:

 *

 * 1) under the terms of the "Common Public License 1.0" a copy of which is

 *    available from the Open Source Initiative, see

 *    http://www.opensource.org/licenses/cpl.php.

 *     Redistribution and use in source and binary forms, with or

 *     without modification, are permitted provided that the following

 *     conditions are met:

 *

 * 2) under the terms of the "The BSD License" a copy of which is

 *    available from the Open Source Initiative, see

 *    http://www.opensource.org/licenses/bsd-license.php.

 *      - Redistributions of source code must retain the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer.

 *

 * 3) under the terms of the "GNU General Public License (GPL) Version 2" a

 *    copy of which is available from the Open Source Initiative, see

 *    http://www.opensource.org/licenses/gpl-license.php.

 *

 * Licensee has the right to choose one of the above licenses.

 *

 * Redistributions of source code must retain the above copyright

 * notice and one of the license notices.

 *

 * Redistributions in binary form must reproduce both the above copyright

 * notice, one of the license notices in the documentation

 * and/or other materials provided with the distribution.

 *      - Redistributions in binary form must reproduce the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer in the documentation and/or other materials

 *        provided with the distribution.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

 * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 */



#if !defined(IB_ADDR_H)

include/rdma/rdma_cm.h

+23 −19
Original line number Diff line number Diff line
@@ -2,29 +2,33 @@ 
 * Copyright (c) 2005 Voltaire Inc.  All rights reserved.

 * Copyright (c) 2005 Intel Corporation.  All rights reserved.

 *

 * This Software is licensed under one of the following licenses:

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU

 * General Public License (GPL) Version 2, available from the file

 * COPYING in the main directory of this source tree, or the

 * OpenIB.org BSD license below:

 *

 * 1) under the terms of the "Common Public License 1.0" a copy of which is

 *    available from the Open Source Initiative, see

 *    http://www.opensource.org/licenses/cpl.php.

 *     Redistribution and use in source and binary forms, with or

 *     without modification, are permitted provided that the following

 *     conditions are met:

 *

 * 2) under the terms of the "The BSD License" a copy of which is

 *    available from the Open Source Initiative, see

 *    http://www.opensource.org/licenses/bsd-license.php.

 *      - Redistributions of source code must retain the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer.

 *

 * 3) under the terms of the "GNU General Public License (GPL) Version 2" a

 *    copy of which is available from the Open Source Initiative, see

 *    http://www.opensource.org/licenses/gpl-license.php.

 *

 * Licensee has the right to choose one of the above licenses.

 *

 * Redistributions of source code must retain the above copyright

 * notice and one of the license notices.

 *

 * Redistributions in binary form must reproduce both the above copyright

 * notice, one of the license notices in the documentation

 * and/or other materials provided with the distribution.

 *      - Redistributions in binary form must reproduce the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer in the documentation and/or other materials

 *        provided with the distribution.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

 * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 */



#if !defined(RDMA_CM_H)

include/rdma/rdma_cm_ib.h

+27 −23
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2006 Intel Corporation.  All rights reserved.

 *

 * This Software is licensed under one of the following licenses:

 *

 * 1) under the terms of the "Common Public License 1.0" a copy of which is

 *    available from the Open Source Initiative, see

 *    http://www.opensource.org/licenses/cpl.php.

 *

 * 2) under the terms of the "The BSD License" a copy of which is

 *    available from the Open Source Initiative, see

 *    http://www.opensource.org/licenses/bsd-license.php.

 *

 * 3) under the terms of the "GNU General Public License (GPL) Version 2" a

 *    copy of which is available from the Open Source Initiative, see

 *    http://www.opensource.org/licenses/gpl-license.php.

 *

 * Licensee has the right to choose one of the above licenses.

 *

 * Redistributions of source code must retain the above copyright

 * notice and one of the license notices.

 *

 * Redistributions in binary form must reproduce both the above copyright

 * notice, one of the license notices in the documentation

 * and/or other materials provided with the distribution.

 *

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU

 * General Public License (GPL) Version 2, available from the file

 * COPYING in the main directory of this source tree, or the

 * OpenIB.org BSD license below:

 *

 *     Redistribution and use in source and binary forms, with or

 *     without modification, are permitted provided that the following

 *     conditions are met:

 *

 *      - Redistributions of source code must retain the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer.

 *

 *      - Redistributions in binary form must reproduce the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer in the documentation and/or other materials

 *        provided with the distribution.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

 * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 */



#if !defined(RDMA_CM_IB_H)