Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a9474917099e007c0f51d5474394b5890111614f

Authored by Sean Hefty
Committed by Roland Dreier
1 parent 929555a2ba
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

Showing 5 changed files with 119 additions and 98 deletions Side-by-side Diff

drivers/infiniband/core/addr.c
Diff comments   View file @ a947491
... ... @@ -4,28 +4,33 @@
4 4 * Copyright (c) 1999-2005, Mellanox Technologies, Inc. All rights reserved.
5 5 * Copyright (c) 2005 Intel Corporation. All rights reserved.
6 6 *
7   - * This Software is licensed under one of the following licenses:
  7 + * This software is available to you under a choice of one of two
  8 + * licenses. You may choose to be licensed under the terms of the GNU
  9 + * General Public License (GPL) Version 2, available from the file
  10 + * COPYING in the main directory of this source tree, or the
  11 + * OpenIB.org BSD license below:
8 12 *
9   - * 1) under the terms of the "Common Public License 1.0" a copy of which is
10   - * available from the Open Source Initiative, see
11   - * http://www.opensource.org/licenses/cpl.php.
  13 + * Redistribution and use in source and binary forms, with or
  14 + * without modification, are permitted provided that the following
  15 + * conditions are met:
12 16 *
13   - * 2) under the terms of the "The BSD License" a copy of which is
14   - * available from the Open Source Initiative, see
15   - * http://www.opensource.org/licenses/bsd-license.php.
  17 + * - Redistributions of source code must retain the above
  18 + * copyright notice, this list of conditions and the following
  19 + * disclaimer.
16 20 *
17   - * 3) under the terms of the "GNU General Public License (GPL) Version 2" a
18   - * copy of which is available from the Open Source Initiative, see
19   - * http://www.opensource.org/licenses/gpl-license.php.
  21 + * - Redistributions in binary form must reproduce the above
  22 + * copyright notice, this list of conditions and the following
  23 + * disclaimer in the documentation and/or other materials
  24 + * provided with the distribution.
20 25 *
21   - * Licensee has the right to choose one of the above licenses.
22   - *
23   - * Redistributions of source code must retain the above copyright
24   - * notice and one of the license notices.
25   - *
26   - * Redistributions in binary form must reproduce both the above copyright
27   - * notice, one of the license notices in the documentation
28   - * and/or other materials provided with the distribution.
  26 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  27 + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  28 + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
  29 + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
  30 + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
  31 + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  32 + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  33 + * SOFTWARE.
29 34 */
30 35  
31 36 #include <linux/mutex.h>
drivers/infiniband/core/cma.c
Diff comments   View file @ a947491
... ... @@ -4,29 +4,33 @@
4 4 * Copyright (c) 1999-2005, Mellanox Technologies, Inc. All rights reserved.
5 5 * Copyright (c) 2005-2006 Intel Corporation. All rights reserved.
6 6 *
7   - * This Software is licensed under one of the following licenses:
  7 + * This software is available to you under a choice of one of two
  8 + * licenses. You may choose to be licensed under the terms of the GNU
  9 + * General Public License (GPL) Version 2, available from the file
  10 + * COPYING in the main directory of this source tree, or the
  11 + * OpenIB.org BSD license below:
8 12 *
9   - * 1) under the terms of the "Common Public License 1.0" a copy of which is
10   - * available from the Open Source Initiative, see
11   - * http://www.opensource.org/licenses/cpl.php.
  13 + * Redistribution and use in source and binary forms, with or
  14 + * without modification, are permitted provided that the following
  15 + * conditions are met:
12 16 *
13   - * 2) under the terms of the "The BSD License" a copy of which is
14   - * available from the Open Source Initiative, see
15   - * http://www.opensource.org/licenses/bsd-license.php.
  17 + * - Redistributions of source code must retain the above
  18 + * copyright notice, this list of conditions and the following
  19 + * disclaimer.
16 20 *
17   - * 3) under the terms of the "GNU General Public License (GPL) Version 2" a
18   - * copy of which is available from the Open Source Initiative, see
19   - * http://www.opensource.org/licenses/gpl-license.php.
  21 + * - Redistributions in binary form must reproduce the above
  22 + * copyright notice, this list of conditions and the following
  23 + * disclaimer in the documentation and/or other materials
  24 + * provided with the distribution.
20 25 *
21   - * Licensee has the right to choose one of the above licenses.
22   - *
23   - * Redistributions of source code must retain the above copyright
24   - * notice and one of the license notices.
25   - *
26   - * Redistributions in binary form must reproduce both the above copyright
27   - * notice, one of the license notices in the documentation
28   - * and/or other materials provided with the distribution.
29   - *
  26 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  27 + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  28 + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
  29 + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
  30 + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
  31 + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  32 + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  33 + * SOFTWARE.
30 34 */
31 35  
32 36 #include <linux/completion.h>
include/rdma/ib_addr.h
Diff comments   View file @ a947491
... ... @@ -2,29 +2,33 @@
2 2 * Copyright (c) 2005 Voltaire Inc. All rights reserved.
3 3 * Copyright (c) 2005 Intel Corporation. All rights reserved.
4 4 *
5   - * This Software is licensed under one of the following licenses:
  5 + * This software is available to you under a choice of one of two
  6 + * licenses. You may choose to be licensed under the terms of the GNU
  7 + * General Public License (GPL) Version 2, available from the file
  8 + * COPYING in the main directory of this source tree, or the
  9 + * OpenIB.org BSD license below:
6 10 *
7   - * 1) under the terms of the "Common Public License 1.0" a copy of which is
8   - * available from the Open Source Initiative, see
9   - * http://www.opensource.org/licenses/cpl.php.
  11 + * Redistribution and use in source and binary forms, with or
  12 + * without modification, are permitted provided that the following
  13 + * conditions are met:
10 14 *
11   - * 2) under the terms of the "The BSD License" a copy of which is
12   - * available from the Open Source Initiative, see
13   - * http://www.opensource.org/licenses/bsd-license.php.
  15 + * - Redistributions of source code must retain the above
  16 + * copyright notice, this list of conditions and the following
  17 + * disclaimer.
14 18 *
15   - * 3) under the terms of the "GNU General Public License (GPL) Version 2" a
16   - * copy of which is available from the Open Source Initiative, see
17   - * http://www.opensource.org/licenses/gpl-license.php.
  19 + * - Redistributions in binary form must reproduce the above
  20 + * copyright notice, this list of conditions and the following
  21 + * disclaimer in the documentation and/or other materials
  22 + * provided with the distribution.
18 23 *
19   - * Licensee has the right to choose one of the above licenses.
20   - *
21   - * Redistributions of source code must retain the above copyright
22   - * notice and one of the license notices.
23   - *
24   - * Redistributions in binary form must reproduce both the above copyright
25   - * notice, one of the license notices in the documentation
26   - * and/or other materials provided with the distribution.
27   - *
  24 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  25 + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  26 + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
  27 + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
  28 + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
  29 + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  30 + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  31 + * SOFTWARE.
28 32 */
29 33  
30 34 #if !defined(IB_ADDR_H)
include/rdma/rdma_cm.h
Diff comments   View file @ a947491
... ... @@ -2,29 +2,33 @@
2 2 * Copyright (c) 2005 Voltaire Inc. All rights reserved.
3 3 * Copyright (c) 2005 Intel Corporation. All rights reserved.
4 4 *
5   - * This Software is licensed under one of the following licenses:
  5 + * This software is available to you under a choice of one of two
  6 + * licenses. You may choose to be licensed under the terms of the GNU
  7 + * General Public License (GPL) Version 2, available from the file
  8 + * COPYING in the main directory of this source tree, or the
  9 + * OpenIB.org BSD license below:
6 10 *
7   - * 1) under the terms of the "Common Public License 1.0" a copy of which is
8   - * available from the Open Source Initiative, see
9   - * http://www.opensource.org/licenses/cpl.php.
  11 + * Redistribution and use in source and binary forms, with or
  12 + * without modification, are permitted provided that the following
  13 + * conditions are met:
10 14 *
11   - * 2) under the terms of the "The BSD License" a copy of which is
12   - * available from the Open Source Initiative, see
13   - * http://www.opensource.org/licenses/bsd-license.php.
  15 + * - Redistributions of source code must retain the above
  16 + * copyright notice, this list of conditions and the following
  17 + * disclaimer.
14 18 *
15   - * 3) under the terms of the "GNU General Public License (GPL) Version 2" a
16   - * copy of which is available from the Open Source Initiative, see
17   - * http://www.opensource.org/licenses/gpl-license.php.
  19 + * - Redistributions in binary form must reproduce the above
  20 + * copyright notice, this list of conditions and the following
  21 + * disclaimer in the documentation and/or other materials
  22 + * provided with the distribution.
18 23 *
19   - * Licensee has the right to choose one of the above licenses.
20   - *
21   - * Redistributions of source code must retain the above copyright
22   - * notice and one of the license notices.
23   - *
24   - * Redistributions in binary form must reproduce both the above copyright
25   - * notice, one of the license notices in the documentation
26   - * and/or other materials provided with the distribution.
27   - *
  24 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  25 + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  26 + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
  27 + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
  28 + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
  29 + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  30 + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  31 + * SOFTWARE.
28 32 */
29 33  
30 34 #if !defined(RDMA_CM_H)
include/rdma/rdma_cm_ib.h
Diff comments   View file @ a947491
1 1 /*
2 2 * Copyright (c) 2006 Intel Corporation. All rights reserved.
3 3 *
4   - * This Software is licensed under one of the following licenses:
  4 + * This software is available to you under a choice of one of two
  5 + * licenses. You may choose to be licensed under the terms of the GNU
  6 + * General Public License (GPL) Version 2, available from the file
  7 + * COPYING in the main directory of this source tree, or the
  8 + * OpenIB.org BSD license below:
5 9 *
6   - * 1) under the terms of the "Common Public License 1.0" a copy of which is
7   - * available from the Open Source Initiative, see
8   - * http://www.opensource.org/licenses/cpl.php.
  10 + * Redistribution and use in source and binary forms, with or
  11 + * without modification, are permitted provided that the following
  12 + * conditions are met:
9 13 *
10   - * 2) under the terms of the "The BSD License" a copy of which is
11   - * available from the Open Source Initiative, see
12   - * http://www.opensource.org/licenses/bsd-license.php.
  14 + * - Redistributions of source code must retain the above
  15 + * copyright notice, this list of conditions and the following
  16 + * disclaimer.
13 17 *
14   - * 3) under the terms of the "GNU General Public License (GPL) Version 2" a
15   - * copy of which is available from the Open Source Initiative, see
16   - * http://www.opensource.org/licenses/gpl-license.php.
  18 + * - Redistributions in binary form must reproduce the above
  19 + * copyright notice, this list of conditions and the following
  20 + * disclaimer in the documentation and/or other materials
  21 + * provided with the distribution.
17 22 *
18   - * Licensee has the right to choose one of the above licenses.
19   - *
20   - * Redistributions of source code must retain the above copyright
21   - * notice and one of the license notices.
22   - *
23   - * Redistributions in binary form must reproduce both the above copyright
24   - * notice, one of the license notices in the documentation
25   - * and/or other materials provided with the distribution.
26   - *
  23 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  24 + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  25 + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
  26 + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
  27 + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
  28 + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  29 + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  30 + * SOFTWARE.
27 31 */
28 32  
29 33 #if !defined(RDMA_CM_IB_H)