[openib-general] Re: [PATCH] new uDAPL openIB provider using socket CM

[James Lentini]

On Tue, 25 Oct 2005, Arlin Davis wrote:

> James,
> 
> Here is a patch to add an optional openIB uDAPL provider that uses the socket CM for anyone having
> problems scaling out with the uCM/uAT version. To build the new provider, simply "make
> VERBS=openib_scm". This version does not require IPoIB, uCM, or uAT.
> 
> -arlin
> 
> Signed-off by: Arlin Davis <ardavis at ichips.intel.com>

Some of the new files in dapl/openib_scm use this license:

dapl/openib_scm/dapl_ib_util.c
> +/*
> + * This Software is licensed under both of the following two licenses:
> + *
> + * 1) under the terms of the "Common Public License 1.0" a copy of which is
> + *    in the file LICENSE.txt in the root directory. The license is also
> + *    available from the Open Source Initiative, see
> + *    http://www.opensource.org/licenses/cpl.php.
> + * OR
> + *
> + * 2) under the terms of the "The BSD License" a copy of which is in the file
> + *    LICENSE2.txt in the root directory. The license is also available from
> + *    the Open Source Initiative, see
> + *    http://www.opensource.org/licenses/bsd-license.php.
> + *
> + * Licensee has the right to choose either one of the above two licenses.
> + *
> + * Redistributions of source code must retain both the above copyright
> + * notice and either one of the license notices.
> + *
> + * Redistributions in binary form must reproduce both the above copyright
> + * notice, either one of the license notices in the documentation
> + * and/or other materials provided with the distribution.
> + */

and other files use this license

dapl/openib_scm/dapl_ib_mem.c
> +/*
> + * 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.
> + */

I'd like all of the files to use the later. Is that acceptable to you? 
If so, please send a new patch with this change.

james