Skip to content

L
linux-davinci
Commit a9474917 authored by Sean Hefty's avatar Sean Hefty Committed by Roland Dreier
Browse files
Options

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
Hide whitespace changes
Inline Side-by-side
Showing with 119 additions and 98 deletions
drivers/infiniband/core/addr.c
View file @ a9474917
...@@ -4,28 +4,33 @@ ...@@ -4,28 +4,33 @@
* Copyright (c) 1999-2005, Mellanox Technologies, Inc. All rights reserved. * Copyright (c) 1999-2005, Mellanox Technologies, Inc. All rights reserved.
* Copyright (c) 2005 Intel Corporation. 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 * Redistribution and use in source and binary forms, with or
* available from the Open Source Initiative, see * without modification, are permitted provided that the following
* http://www.opensource.org/licenses/cpl.php. * conditions are met:
* *
* 2) under the terms of the "The BSD License" a copy of which is * - Redistributions of source code must retain the above
* available from the Open Source Initiative, see * copyright notice, this list of conditions and the following
* http://www.opensource.org/licenses/bsd-license.php. * disclaimer.
* *
* 3) under the terms of the "GNU General Public License (GPL) Version 2" a * - Redistributions in binary form must reproduce the above
* copy of which is available from the Open Source Initiative, see * copyright notice, this list of conditions and the following
* http://www.opensource.org/licenses/gpl-license.php. * disclaimer in the documentation and/or other materials
* provided with the distribution.
* *
* Licensee has the right to choose one of the above licenses. * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* Redistributions of source code must retain the above copyright * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* notice and one of the license notices. * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
* * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
* Redistributions in binary form must reproduce both the above copyright * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* notice, one of the license notices in the documentation * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* and/or other materials provided with the distribution. * SOFTWARE.
*/ */
#include <linux/mutex.h> #include <linux/mutex.h>
......
drivers/infiniband/core/cma.c
View file @ a9474917
...@@ -4,29 +4,33 @@ ...@@ -4,29 +4,33 @@
* Copyright (c) 1999-2005, Mellanox Technologies, Inc. All rights reserved. * Copyright (c) 1999-2005, Mellanox Technologies, Inc. All rights reserved.
* Copyright (c) 2005-2006 Intel Corporation. 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 * Redistribution and use in source and binary forms, with or
* available from the Open Source Initiative, see * without modification, are permitted provided that the following
* http://www.opensource.org/licenses/cpl.php. * conditions are met:
* *
* 2) under the terms of the "The BSD License" a copy of which is * - Redistributions of source code must retain the above
* available from the Open Source Initiative, see * copyright notice, this list of conditions and the following
* http://www.opensource.org/licenses/bsd-license.php. * disclaimer.
* *
* 3) under the terms of the "GNU General Public License (GPL) Version 2" a * - Redistributions in binary form must reproduce the above
* copy of which is available from the Open Source Initiative, see * copyright notice, this list of conditions and the following
* http://www.opensource.org/licenses/gpl-license.php. * 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/completion.h> #include <linux/completion.h>
......
include/rdma/ib_addr.h
View file @ a9474917
...@@ -2,29 +2,33 @@ ...@@ -2,29 +2,33 @@
* Copyright (c) 2005 Voltaire Inc. All rights reserved. * Copyright (c) 2005 Voltaire Inc. All rights reserved.
* Copyright (c) 2005 Intel Corporation. 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 * Redistribution and use in source and binary forms, with or
* available from the Open Source Initiative, see * without modification, are permitted provided that the following
* http://www.opensource.org/licenses/cpl.php. * conditions are met:
* *
* 2) under the terms of the "The BSD License" a copy of which is * - Redistributions of source code must retain the above
* available from the Open Source Initiative, see * copyright notice, this list of conditions and the following
* http://www.opensource.org/licenses/bsd-license.php. * disclaimer.
* *
* 3) under the terms of the "GNU General Public License (GPL) Version 2" a * - Redistributions in binary form must reproduce the above
* copy of which is available from the Open Source Initiative, see * copyright notice, this list of conditions and the following
* http://www.opensource.org/licenses/gpl-license.php. * 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.
*/ */
#if !defined(IB_ADDR_H) #if !defined(IB_ADDR_H)
......
include/rdma/rdma_cm.h
View file @ a9474917
...@@ -2,29 +2,33 @@ ...@@ -2,29 +2,33 @@
* Copyright (c) 2005 Voltaire Inc. All rights reserved. * Copyright (c) 2005 Voltaire Inc. All rights reserved.
* Copyright (c) 2005 Intel Corporation. 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 * Redistribution and use in source and binary forms, with or
* available from the Open Source Initiative, see * without modification, are permitted provided that the following
* http://www.opensource.org/licenses/cpl.php. * conditions are met:
* *
* 2) under the terms of the "The BSD License" a copy of which is * - Redistributions of source code must retain the above
* available from the Open Source Initiative, see * copyright notice, this list of conditions and the following
* http://www.opensource.org/licenses/bsd-license.php. * disclaimer.
* *
* 3) under the terms of the "GNU General Public License (GPL) Version 2" a * - Redistributions in binary form must reproduce the above
* copy of which is available from the Open Source Initiative, see * copyright notice, this list of conditions and the following
* http://www.opensource.org/licenses/gpl-license.php. * 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.
*/ */
#if !defined(RDMA_CM_H) #if !defined(RDMA_CM_H)
......
include/rdma/rdma_cm_ib.h
View file @ a9474917
/* /*
* Copyright (c) 2006 Intel Corporation. All rights reserved. * Copyright (c) 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
* 1) under the terms of the "Common Public License 1.0" a copy of which is * General Public License (GPL) Version 2, available from the file
* available from the Open Source Initiative, see * COPYING in the main directory of this source tree, or the
* http://www.opensource.org/licenses/cpl.php. * OpenIB.org BSD license below:
* *
* 2) under the terms of the "The BSD License" a copy of which is * Redistribution and use in source and binary forms, with or
* available from the Open Source Initiative, see * without modification, are permitted provided that the following
* http://www.opensource.org/licenses/bsd-license.php. * conditions are met:
* *
* 3) under the terms of the "GNU General Public License (GPL) Version 2" a * - Redistributions of source code must retain the above
* copy of which is available from the Open Source Initiative, see * copyright notice, this list of conditions and the following
* http://www.opensource.org/licenses/gpl-license.php. * disclaimer.
* *
* Licensee has the right to choose one of the above licenses. * - Redistributions in binary form must reproduce the above
* * copyright notice, this list of conditions and the following
* Redistributions of source code must retain the above copyright * disclaimer in the documentation and/or other materials
* notice and one of the license notices. * provided with the distribution.
* *
* Redistributions in binary form must reproduce both the above copyright * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* notice, one of the license notices in the documentation * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* and/or other materials provided with the distribution. * 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) #if !defined(RDMA_CM_IB_H)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment