On 09/30/2015 04:34 PM, Jeff Squyres wrote:
> The usnic_verbs kernel module was clearly marked with the following in
> its code:
>
> MODULE_LICENSE("Dual BSD/GPL");
>
> However, we accidentally left a few clauses of the BSD text out of the
> license header in all the source files. This commit fixes that: all
> the files are properly dual BSD/GPL-licensed.
>
> Signed-off-by: Jeff Squyres <[email protected]>I added all of the people that are Cc:ed on this email to the Cc: list in the changelog, but otherwise, applied. > --- > drivers/infiniband/hw/usnic/usnic.h | 21 > ++++++++++++++++++--- > drivers/infiniband/hw/usnic/usnic_abi.h | 21 > ++++++++++++++++++--- > drivers/infiniband/hw/usnic/usnic_common_pkt_hdr.h | 21 > ++++++++++++++++++--- > drivers/infiniband/hw/usnic/usnic_common_util.h | 21 > ++++++++++++++++++--- > drivers/infiniband/hw/usnic/usnic_debugfs.c | 21 > ++++++++++++++++++--- > drivers/infiniband/hw/usnic/usnic_debugfs.h | 21 > ++++++++++++++++++--- > drivers/infiniband/hw/usnic/usnic_fwd.c | 21 > ++++++++++++++++++--- > drivers/infiniband/hw/usnic/usnic_fwd.h | 21 > ++++++++++++++++++--- > drivers/infiniband/hw/usnic/usnic_ib.h | 21 > ++++++++++++++++++--- > drivers/infiniband/hw/usnic/usnic_ib_main.c | 21 > ++++++++++++++++++--- > drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c | 21 > ++++++++++++++++++--- > drivers/infiniband/hw/usnic/usnic_ib_qp_grp.h | 21 > ++++++++++++++++++--- > drivers/infiniband/hw/usnic/usnic_ib_sysfs.c | 21 > ++++++++++++++++++--- > drivers/infiniband/hw/usnic/usnic_ib_sysfs.h | 21 > ++++++++++++++++++--- > drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 21 > ++++++++++++++++++--- > drivers/infiniband/hw/usnic/usnic_ib_verbs.h | 21 > ++++++++++++++++++--- > drivers/infiniband/hw/usnic/usnic_log.h | 21 > ++++++++++++++++++--- > drivers/infiniband/hw/usnic/usnic_transport.c | 21 > ++++++++++++++++++--- > drivers/infiniband/hw/usnic/usnic_transport.h | 21 > ++++++++++++++++++--- > drivers/infiniband/hw/usnic/usnic_uiom.c | 2 +- > drivers/infiniband/hw/usnic/usnic_uiom.h | 21 > ++++++++++++++++++--- > .../infiniband/hw/usnic/usnic_uiom_interval_tree.c | 21 > ++++++++++++++++++--- > .../infiniband/hw/usnic/usnic_uiom_interval_tree.h | 21 > ++++++++++++++++++--- > drivers/infiniband/hw/usnic/usnic_vnic.c | 21 > ++++++++++++++++++--- > drivers/infiniband/hw/usnic/usnic_vnic.h | 21 > ++++++++++++++++++--- > 25 files changed, 433 insertions(+), 73 deletions(-) > > diff --git a/drivers/infiniband/hw/usnic/usnic.h > b/drivers/infiniband/hw/usnic/usnic.h > index 5be13d8..f903502 100644 > --- a/drivers/infiniband/hw/usnic/usnic.h > +++ b/drivers/infiniband/hw/usnic/usnic.h > @@ -1,9 +1,24 @@ > /* > * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. > * > - * This program is free software; you may redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; version 2 of the License. > + * 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 > + * 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 > diff --git a/drivers/infiniband/hw/usnic/usnic_abi.h > b/drivers/infiniband/hw/usnic/usnic_abi.h > index 04a6622..7fe9502 100644 > --- a/drivers/infiniband/hw/usnic/usnic_abi.h > +++ b/drivers/infiniband/hw/usnic/usnic_abi.h > @@ -1,9 +1,24 @@ > /* > * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. > * > - * This program is free software; you may redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; version 2 of the License. > + * 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 > + * 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 > diff --git a/drivers/infiniband/hw/usnic/usnic_common_pkt_hdr.h > b/drivers/infiniband/hw/usnic/usnic_common_pkt_hdr.h > index 3935672..596e0ed 100644 > --- a/drivers/infiniband/hw/usnic/usnic_common_pkt_hdr.h > +++ b/drivers/infiniband/hw/usnic/usnic_common_pkt_hdr.h > @@ -1,9 +1,24 @@ > /* > * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. > * > - * This program is free software; you may redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; version 2 of the License. > + * 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 > + * 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 > diff --git a/drivers/infiniband/hw/usnic/usnic_common_util.h > b/drivers/infiniband/hw/usnic/usnic_common_util.h > index 9d737ed..b54986d 100644 > --- a/drivers/infiniband/hw/usnic/usnic_common_util.h > +++ b/drivers/infiniband/hw/usnic/usnic_common_util.h > @@ -1,9 +1,24 @@ > /* > * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. > * > - * This program is free software; you may redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; version 2 of the License. > + * 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 > + * 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 > diff --git a/drivers/infiniband/hw/usnic/usnic_debugfs.c > b/drivers/infiniband/hw/usnic/usnic_debugfs.c > index 5d13860..5e55b8b 100644 > --- a/drivers/infiniband/hw/usnic/usnic_debugfs.c > +++ b/drivers/infiniband/hw/usnic/usnic_debugfs.c > @@ -1,9 +1,24 @@ > /* > * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. > * > - * This program is free software; you may redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; version 2 of the License. > + * 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 > + * 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 > diff --git a/drivers/infiniband/hw/usnic/usnic_debugfs.h > b/drivers/infiniband/hw/usnic/usnic_debugfs.h > index 4087d24..98453e9 100644 > --- a/drivers/infiniband/hw/usnic/usnic_debugfs.h > +++ b/drivers/infiniband/hw/usnic/usnic_debugfs.h > @@ -1,9 +1,24 @@ > /* > * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. > * > - * This program is free software; you may redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; version 2 of the License. > + * 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 > + * 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 > diff --git a/drivers/infiniband/hw/usnic/usnic_fwd.c > b/drivers/infiniband/hw/usnic/usnic_fwd.c > index e3c9bd9..3c37dd5 100644 > --- a/drivers/infiniband/hw/usnic/usnic_fwd.c > +++ b/drivers/infiniband/hw/usnic/usnic_fwd.c > @@ -1,9 +1,24 @@ > /* > * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. > * > - * This program is free software; you may redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; version 2 of the License. > + * 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 > + * 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 > diff --git a/drivers/infiniband/hw/usnic/usnic_fwd.h > b/drivers/infiniband/hw/usnic/usnic_fwd.h > index 93713a2..3a8add9 100644 > --- a/drivers/infiniband/hw/usnic/usnic_fwd.h > +++ b/drivers/infiniband/hw/usnic/usnic_fwd.h > @@ -1,9 +1,24 @@ > /* > * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. > * > - * This program is free software; you may redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; version 2 of the License. > + * 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 > + * 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 > diff --git a/drivers/infiniband/hw/usnic/usnic_ib.h > b/drivers/infiniband/hw/usnic/usnic_ib.h > index e5a9297..525bf27 100644 > --- a/drivers/infiniband/hw/usnic/usnic_ib.h > +++ b/drivers/infiniband/hw/usnic/usnic_ib.h > @@ -1,9 +1,24 @@ > /* > * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. > * > - * This program is free software; you may redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; version 2 of the License. > + * 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 > + * 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 > diff --git a/drivers/infiniband/hw/usnic/usnic_ib_main.c > b/drivers/infiniband/hw/usnic/usnic_ib_main.c > index 34c49b8..0c15bd8 100644 > --- a/drivers/infiniband/hw/usnic/usnic_ib_main.c > +++ b/drivers/infiniband/hw/usnic/usnic_ib_main.c > @@ -1,9 +1,24 @@ > /* > * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. > * > - * This program is free software; you may redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; version 2 of the License. > + * 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 > + * 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 > diff --git a/drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c > b/drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c > index db3588d..85dc3f9 100644 > --- a/drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c > +++ b/drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c > @@ -1,9 +1,24 @@ > /* > * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. > * > - * This program is free software; you may redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; version 2 of the License. > + * 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 > + * 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 > diff --git a/drivers/infiniband/hw/usnic/usnic_ib_qp_grp.h > b/drivers/infiniband/hw/usnic/usnic_ib_qp_grp.h > index b0aafe8..b1458be 100644 > --- a/drivers/infiniband/hw/usnic/usnic_ib_qp_grp.h > +++ b/drivers/infiniband/hw/usnic/usnic_ib_qp_grp.h > @@ -1,9 +1,24 @@ > /* > * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. > * > - * This program is free software; you may redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; version 2 of the License. > + * 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 > + * 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 > diff --git a/drivers/infiniband/hw/usnic/usnic_ib_sysfs.c > b/drivers/infiniband/hw/usnic/usnic_ib_sysfs.c > index 27dc67c..3412ea0 100644 > --- a/drivers/infiniband/hw/usnic/usnic_ib_sysfs.c > +++ b/drivers/infiniband/hw/usnic/usnic_ib_sysfs.c > @@ -1,9 +1,24 @@ > /* > * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. > * > - * This program is free software; you may redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; version 2 of the License. > + * 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 > + * 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 > diff --git a/drivers/infiniband/hw/usnic/usnic_ib_sysfs.h > b/drivers/infiniband/hw/usnic/usnic_ib_sysfs.h > index 0d09b49..3d98e16 100644 > --- a/drivers/infiniband/hw/usnic/usnic_ib_sysfs.h > +++ b/drivers/infiniband/hw/usnic/usnic_ib_sysfs.h > @@ -1,9 +1,24 @@ > /* > * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. > * > - * This program is free software; you may redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; version 2 of the License. > + * 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 > + * 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 > diff --git a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c > b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c > index 7df4382..f8e3211 100644 > --- a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c > +++ b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c > @@ -1,9 +1,24 @@ > /* > * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. > * > - * This program is free software; you may redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; version 2 of the License. > + * 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 > + * 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 > diff --git a/drivers/infiniband/hw/usnic/usnic_ib_verbs.h > b/drivers/infiniband/hw/usnic/usnic_ib_verbs.h > index 0bd04ef..414eaa5 100644 > --- a/drivers/infiniband/hw/usnic/usnic_ib_verbs.h > +++ b/drivers/infiniband/hw/usnic/usnic_ib_verbs.h > @@ -1,9 +1,24 @@ > /* > * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. > * > - * This program is free software; you may redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; version 2 of the License. > + * 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 > + * 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 > diff --git a/drivers/infiniband/hw/usnic/usnic_log.h > b/drivers/infiniband/hw/usnic/usnic_log.h > index 75777a6..183fcb6 100644 > --- a/drivers/infiniband/hw/usnic/usnic_log.h > +++ b/drivers/infiniband/hw/usnic/usnic_log.h > @@ -1,9 +1,24 @@ > /* > * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. > * > - * This program is free software; you may redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; version 2 of the License. > + * 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 > + * 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 > diff --git a/drivers/infiniband/hw/usnic/usnic_transport.c > b/drivers/infiniband/hw/usnic/usnic_transport.c > index ddef6f7..de31838 100644 > --- a/drivers/infiniband/hw/usnic/usnic_transport.c > +++ b/drivers/infiniband/hw/usnic/usnic_transport.c > @@ -1,9 +1,24 @@ > /* > * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. > * > - * This program is free software; you may redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; version 2 of the License. > + * 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 > + * 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 > diff --git a/drivers/infiniband/hw/usnic/usnic_transport.h > b/drivers/infiniband/hw/usnic/usnic_transport.h > index 7e5dc6d..9a7a2d9 100644 > --- a/drivers/infiniband/hw/usnic/usnic_transport.h > +++ b/drivers/infiniband/hw/usnic/usnic_transport.h > @@ -1,9 +1,24 @@ > /* > * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. > * > - * This program is free software; you may redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; version 2 of the License. > + * 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 > + * 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 > diff --git a/drivers/infiniband/hw/usnic/usnic_uiom.c > b/drivers/infiniband/hw/usnic/usnic_uiom.c > index cb2337f..645a5f6 100644 > --- a/drivers/infiniband/hw/usnic/usnic_uiom.c > +++ b/drivers/infiniband/hw/usnic/usnic_uiom.c > @@ -7,7 +7,7 @@ > * 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: > + * BSD license below: > * > * Redistribution and use in source and binary forms, with or > * without modification, are permitted provided that the following > diff --git a/drivers/infiniband/hw/usnic/usnic_uiom.h > b/drivers/infiniband/hw/usnic/usnic_uiom.h > index 7044099..45ca7c1 100644 > --- a/drivers/infiniband/hw/usnic/usnic_uiom.h > +++ b/drivers/infiniband/hw/usnic/usnic_uiom.h > @@ -1,9 +1,24 @@ > /* > * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. > * > - * This program is free software; you may redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; version 2 of the License. > + * 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 > + * 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 > diff --git a/drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.c > b/drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.c > index 3a4288e..42b4b4c 100644 > --- a/drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.c > +++ b/drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.c > @@ -1,9 +1,24 @@ > /* > * Copyright (c) 2014, Cisco Systems, Inc. All rights reserved. > * > - * This program is free software; you may redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; version 2 of the License. > + * 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 > + * 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 > diff --git a/drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.h > b/drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.h > index d4f752e..c0b0b87 100644 > --- a/drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.h > +++ b/drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.h > @@ -1,9 +1,24 @@ > /* > * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. > * > - * This program is free software; you may redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; version 2 of the License. > + * 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 > + * 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 > diff --git a/drivers/infiniband/hw/usnic/usnic_vnic.c > b/drivers/infiniband/hw/usnic/usnic_vnic.c > index 656b88c..66de93f 100644 > --- a/drivers/infiniband/hw/usnic/usnic_vnic.c > +++ b/drivers/infiniband/hw/usnic/usnic_vnic.c > @@ -1,9 +1,24 @@ > /* > * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. > * > - * This program is free software; you may redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; version 2 of the License. > + * 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 > + * 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 > diff --git a/drivers/infiniband/hw/usnic/usnic_vnic.h > b/drivers/infiniband/hw/usnic/usnic_vnic.h > index 14d931a..a08423e 100644 > --- a/drivers/infiniband/hw/usnic/usnic_vnic.h > +++ b/drivers/infiniband/hw/usnic/usnic_vnic.h > @@ -1,9 +1,24 @@ > /* > * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. > * > - * This program is free software; you may redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; version 2 of the License. > + * 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 > + * 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 > -- Doug Ledford <[email protected]> GPG KeyID: 0E572FDD
signature.asc
Description: OpenPGP digital signature
