From e72998b164396996a0b17526cd7c6024b908bfdb Mon Sep 17 00:00:00 2001 From: Devesh Sharma Date: Tue, 16 Jun 2015 22:24:51 +0530 Subject: [PATCH] RDMA/ocrdma: insert Dual/BSD license. This patch updates ocrdma driver license to Dual/BSD GPL. Signed-off-by: Devesh Sharma --- ...ate-license-from-gpl-to-dual-license.patch | 843 ++++++++++++++++++ ...pdate-module-license-to-dual-license.patch | 29 + 2 files changed, 872 insertions(+) create mode 100644 linux-next-pending/0021-RDMA-ocrdma-update-license-from-gpl-to-dual-license.patch create mode 100644 linux-next-pending/0022-RDMA-ocrdma-update-module-license-to-dual-license.patch diff --git a/linux-next-pending/0021-RDMA-ocrdma-update-license-from-gpl-to-dual-license.patch b/linux-next-pending/0021-RDMA-ocrdma-update-license-from-gpl-to-dual-license.patch new file mode 100644 index 0000000..223efda --- /dev/null +++ b/linux-next-pending/0021-RDMA-ocrdma-update-license-from-gpl-to-dual-license.patch @@ -0,0 +1,843 @@ +From 62daa2ef8d07a9a2e73a401c83ce127421a90bc6 Mon Sep 17 00:00:00 2001 +From: Devesh Sharma +Date: Fri, 12 Jun 2015 22:13:09 +0530 +Subject: [PATCH 1/2] RDMA/ocrdma: update license from gpl to dual license + +This patch edits the legal statement for ocrdma driver code and +moves it to GPL/Dual-BSD license. + +Signed-off-by: Devesh Sharma +--- + drivers/infiniband/hw/ocrdma/ocrdma.h | 53 +++++++++++++++++---------- + drivers/infiniband/hw/ocrdma/ocrdma_abi.h | 53 +++++++++++++++++---------- + drivers/infiniband/hw/ocrdma/ocrdma_ah.c | 53 +++++++++++++++++---------- + drivers/infiniband/hw/ocrdma/ocrdma_ah.h | 53 +++++++++++++++++---------- + drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 53 +++++++++++++++++---------- + drivers/infiniband/hw/ocrdma/ocrdma_hw.h | 53 +++++++++++++++++---------- + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 53 +++++++++++++++++---------- + drivers/infiniband/hw/ocrdma/ocrdma_sli.h | 53 +++++++++++++++++---------- + drivers/infiniband/hw/ocrdma/ocrdma_stats.c | 53 +++++++++++++++++---------- + drivers/infiniband/hw/ocrdma/ocrdma_stats.h | 53 +++++++++++++++++---------- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 53 +++++++++++++++++---------- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.h | 53 +++++++++++++++++---------- + 12 files changed, 408 insertions(+), 228 deletions(-) + +diff --git a/drivers/infiniband/hw/ocrdma/ocrdma.h b/drivers/infiniband/hw/ocrdma/ocrdma.h +index 8c84caf..c293491 100644 +--- a/drivers/infiniband/hw/ocrdma/ocrdma.h ++++ b/drivers/infiniband/hw/ocrdma/ocrdma.h +@@ -1,21 +1,36 @@ +-/******************************************************************* +- * This file is part of the Emulex RoCE Device Driver for * +- * RoCE (RDMA over Converged Ethernet) adapters. * +- * Copyright (C) 2008-2012 Emulex. All rights reserved. * +- * EMULEX and SLI are trademarks of Emulex. * +- * www.emulex.com * +- * * +- * This program is free software; you can redistribute it and/or * +- * modify it under the terms of version 2 of the GNU General * +- * Public License as published by the Free Software Foundation. * +- * This program is distributed in the hope that it will be useful. * +- * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND * +- * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, * +- * FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE * +- * DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD * +- * TO BE LEGALLY INVALID. See the GNU General Public License for * +- * more details, a copy of which can be found in the file COPYING * +- * included with this package. * ++/* This file is part of the Emulex RoCE Device Driver for ++ * RoCE (RDMA over Converged Ethernet) adapters. ++ * Copyright (C) 2012-2015 Emulex. All rights reserved. ++ * EMULEX and SLI are trademarks of Emulex. ++ * www.emulex.com ++ * ++ * 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. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE ++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR ++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF ++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR ++ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, ++ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR ++ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ++ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Contact Information: + * linux-drivers@emulex.com +@@ -23,7 +38,7 @@ + * Emulex + * 3333 Susan Street + * Costa Mesa, CA 92626 +- *******************************************************************/ ++ */ + + #ifndef __OCRDMA_H__ + #define __OCRDMA_H__ +diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_abi.h b/drivers/infiniband/hw/ocrdma/ocrdma_abi.h +index 1554cca..430b135 100644 +--- a/drivers/infiniband/hw/ocrdma/ocrdma_abi.h ++++ b/drivers/infiniband/hw/ocrdma/ocrdma_abi.h +@@ -1,21 +1,36 @@ +-/******************************************************************* +- * This file is part of the Emulex RoCE Device Driver for * +- * RoCE (RDMA over Converged Ethernet) adapters. * +- * Copyright (C) 2008-2012 Emulex. All rights reserved. * +- * EMULEX and SLI are trademarks of Emulex. * +- * www.emulex.com * +- * * +- * This program is free software; you can redistribute it and/or * +- * modify it under the terms of version 2 of the GNU General * +- * Public License as published by the Free Software Foundation. * +- * This program is distributed in the hope that it will be useful. * +- * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND * +- * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, * +- * FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE * +- * DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD * +- * TO BE LEGALLY INVALID. See the GNU General Public License for * +- * more details, a copy of which can be found in the file COPYING * +- * included with this package. * ++/* This file is part of the Emulex RoCE Device Driver for ++ * RoCE (RDMA over Converged Ethernet) adapters. ++ * Copyright (C) 2012-2015 Emulex. All rights reserved. ++ * EMULEX and SLI are trademarks of Emulex. ++ * www.emulex.com ++ * ++ * 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. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE ++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR ++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF ++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR ++ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, ++ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR ++ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ++ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Contact Information: + * linux-drivers@emulex.com +@@ -23,7 +38,7 @@ + * Emulex + * 3333 Susan Street + * Costa Mesa, CA 92626 +- *******************************************************************/ ++ */ + + #ifndef __OCRDMA_ABI_H__ + #define __OCRDMA_ABI_H__ +diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_ah.c b/drivers/infiniband/hw/ocrdma/ocrdma_ah.c +index f5a5ea8..40af2d4 100644 +--- a/drivers/infiniband/hw/ocrdma/ocrdma_ah.c ++++ b/drivers/infiniband/hw/ocrdma/ocrdma_ah.c +@@ -1,21 +1,36 @@ +-/******************************************************************* +- * This file is part of the Emulex RoCE Device Driver for * +- * RoCE (RDMA over Converged Ethernet) adapters. * +- * Copyright (C) 2008-2012 Emulex. All rights reserved. * +- * EMULEX and SLI are trademarks of Emulex. * +- * www.emulex.com * +- * * +- * This program is free software; you can redistribute it and/or * +- * modify it under the terms of version 2 of the GNU General * +- * Public License as published by the Free Software Foundation. * +- * This program is distributed in the hope that it will be useful. * +- * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND * +- * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, * +- * FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE * +- * DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD * +- * TO BE LEGALLY INVALID. See the GNU General Public License for * +- * more details, a copy of which can be found in the file COPYING * +- * included with this package. * ++/* This file is part of the Emulex RoCE Device Driver for ++ * RoCE (RDMA over Converged Ethernet) adapters. ++ * Copyright (C) 2012-2015 Emulex. All rights reserved. ++ * EMULEX and SLI are trademarks of Emulex. ++ * www.emulex.com ++ * ++ * 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. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE ++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR ++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF ++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR ++ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, ++ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR ++ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ++ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Contact Information: + * linux-drivers@emulex.com +@@ -23,7 +38,7 @@ + * Emulex + * 3333 Susan Street + * Costa Mesa, CA 92626 +- *******************************************************************/ ++ */ + + #include + #include +diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_ah.h b/drivers/infiniband/hw/ocrdma/ocrdma_ah.h +index 726a87c..a139ea1 100644 +--- a/drivers/infiniband/hw/ocrdma/ocrdma_ah.h ++++ b/drivers/infiniband/hw/ocrdma/ocrdma_ah.h +@@ -1,21 +1,36 @@ +-/******************************************************************* +- * This file is part of the Emulex RoCE Device Driver for * +- * RoCE (RDMA over Converged Ethernet) adapters. * +- * Copyright (C) 2008-2012 Emulex. All rights reserved. * +- * EMULEX and SLI are trademarks of Emulex. * +- * www.emulex.com * +- * * +- * This program is free software; you can redistribute it and/or * +- * modify it under the terms of version 2 of the GNU General * +- * Public License as published by the Free Software Foundation. * +- * This program is distributed in the hope that it will be useful. * +- * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND * +- * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, * +- * FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE * +- * DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD * +- * TO BE LEGALLY INVALID. See the GNU General Public License for * +- * more details, a copy of which can be found in the file COPYING * +- * included with this package. * ++/* This file is part of the Emulex RoCE Device Driver for ++ * RoCE (RDMA over Converged Ethernet) adapters. ++ * Copyright (C) 2012-2015 Emulex. All rights reserved. ++ * EMULEX and SLI are trademarks of Emulex. ++ * www.emulex.com ++ * ++ * 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. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE ++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR ++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF ++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR ++ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, ++ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR ++ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ++ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Contact Information: + * linux-drivers@emulex.com +@@ -23,7 +38,7 @@ + * Emulex + * 3333 Susan Street + * Costa Mesa, CA 92626 +- *******************************************************************/ ++ */ + + #ifndef __OCRDMA_AH_H__ + #define __OCRDMA_AH_H__ +diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c +index af8e407..8776e12 100644 +--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c ++++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c +@@ -1,21 +1,36 @@ +-/******************************************************************* +- * This file is part of the Emulex RoCE Device Driver for * +- * RoCE (RDMA over Converged Ethernet) CNA Adapters. * +- * Copyright (C) 2008-2012 Emulex. All rights reserved. * +- * EMULEX and SLI are trademarks of Emulex. * +- * www.emulex.com * +- * * +- * This program is free software; you can redistribute it and/or * +- * modify it under the terms of version 2 of the GNU General * +- * Public License as published by the Free Software Foundation. * +- * This program is distributed in the hope that it will be useful. * +- * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND * +- * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, * +- * FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE * +- * DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD * +- * TO BE LEGALLY INVALID. See the GNU General Public License for * +- * more details, a copy of which can be found in the file COPYING * +- * included with this package. * ++/* This file is part of the Emulex RoCE Device Driver for ++ * RoCE (RDMA over Converged Ethernet) adapters. ++ * Copyright (C) 2012-2015 Emulex. All rights reserved. ++ * EMULEX and SLI are trademarks of Emulex. ++ * www.emulex.com ++ * ++ * 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. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE ++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR ++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF ++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR ++ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, ++ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR ++ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ++ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Contact Information: + * linux-drivers@emulex.com +@@ -23,7 +38,7 @@ + * Emulex + * 3333 Susan Street + * Costa Mesa, CA 92626 +- *******************************************************************/ ++ */ + + #include + #include +diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.h b/drivers/infiniband/hw/ocrdma/ocrdma_hw.h +index e905972..7ed885c 100644 +--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.h ++++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.h +@@ -1,21 +1,36 @@ +-/******************************************************************* +- * This file is part of the Emulex RoCE Device Driver for * +- * RoCE (RDMA over Converged Ethernet) CNA Adapters. * +- * Copyright (C) 2008-2012 Emulex. All rights reserved. * +- * EMULEX and SLI are trademarks of Emulex. * +- * www.emulex.com * +- * * +- * This program is free software; you can redistribute it and/or * +- * modify it under the terms of version 2 of the GNU General * +- * Public License as published by the Free Software Foundation. * +- * This program is distributed in the hope that it will be useful. * +- * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND * +- * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, * +- * FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE * +- * DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD * +- * TO BE LEGALLY INVALID. See the GNU General Public License for * +- * more details, a copy of which can be found in the file COPYING * +- * included with this package. * ++/* This file is part of the Emulex RoCE Device Driver for ++ * RoCE (RDMA over Converged Ethernet) adapters. ++ * Copyright (C) 2012-2015 Emulex. All rights reserved. ++ * EMULEX and SLI are trademarks of Emulex. ++ * www.emulex.com ++ * ++ * 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. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE ++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR ++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF ++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR ++ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, ++ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR ++ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ++ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Contact Information: + * linux-drivers@emulex.com +@@ -23,7 +38,7 @@ + * Emulex + * 3333 Susan Street + * Costa Mesa, CA 92626 +- *******************************************************************/ ++ */ + + #ifndef __OCRDMA_HW_H__ + #define __OCRDMA_HW_H__ +diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c +index 318e383..b2f4db0 100644 +--- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c ++++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c +@@ -1,21 +1,36 @@ +-/******************************************************************* +- * This file is part of the Emulex RoCE Device Driver for * +- * RoCE (RDMA over Converged Ethernet) adapters. * +- * Copyright (C) 2008-2012 Emulex. All rights reserved. * +- * EMULEX and SLI are trademarks of Emulex. * +- * www.emulex.com * +- * * +- * This program is free software; you can redistribute it and/or * +- * modify it under the terms of version 2 of the GNU General * +- * Public License as published by the Free Software Foundation. * +- * This program is distributed in the hope that it will be useful. * +- * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND * +- * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, * +- * FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE * +- * DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD * +- * TO BE LEGALLY INVALID. See the GNU General Public License for * +- * more details, a copy of which can be found in the file COPYING * +- * included with this package. * ++/* This file is part of the Emulex RoCE Device Driver for ++ * RoCE (RDMA over Converged Ethernet) adapters. ++ * Copyright (C) 2012-2015 Emulex. All rights reserved. ++ * EMULEX and SLI are trademarks of Emulex. ++ * www.emulex.com ++ * ++ * 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. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE ++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR ++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF ++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR ++ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, ++ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR ++ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ++ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Contact Information: + * linux-drivers@emulex.com +@@ -23,7 +38,7 @@ + * Emulex + * 3333 Susan Street + * Costa Mesa, CA 92626 +- *******************************************************************/ ++ */ + + #include + #include +diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_sli.h b/drivers/infiniband/hw/ocrdma/ocrdma_sli.h +index 02ad0ae..80006b2 100644 +--- a/drivers/infiniband/hw/ocrdma/ocrdma_sli.h ++++ b/drivers/infiniband/hw/ocrdma/ocrdma_sli.h +@@ -1,21 +1,36 @@ +-/******************************************************************* +- * This file is part of the Emulex RoCE Device Driver for * +- * RoCE (RDMA over Converged Ethernet) adapters. * +- * Copyright (C) 2008-2012 Emulex. All rights reserved. * +- * EMULEX and SLI are trademarks of Emulex. * +- * www.emulex.com * +- * * +- * This program is free software; you can redistribute it and/or * +- * modify it under the terms of version 2 of the GNU General * +- * Public License as published by the Free Software Foundation. * +- * This program is distributed in the hope that it will be useful. * +- * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND * +- * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, * +- * FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE * +- * DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD * +- * TO BE LEGALLY INVALID. See the GNU General Public License for * +- * more details, a copy of which can be found in the file COPYING * +- * included with this package. * ++/* This file is part of the Emulex RoCE Device Driver for ++ * RoCE (RDMA over Converged Ethernet) adapters. ++ * Copyright (C) 2012-2015 Emulex. All rights reserved. ++ * EMULEX and SLI are trademarks of Emulex. ++ * www.emulex.com ++ * ++ * 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. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE ++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR ++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF ++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR ++ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, ++ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR ++ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ++ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Contact Information: + * linux-drivers@emulex.com +@@ -23,7 +38,7 @@ + * Emulex + * 3333 Susan Street + * Costa Mesa, CA 92626 +- *******************************************************************/ ++ */ + + #ifndef __OCRDMA_SLI_H__ + #define __OCRDMA_SLI_H__ +diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_stats.c b/drivers/infiniband/hw/ocrdma/ocrdma_stats.c +index a8822a2..b9e5e10 100644 +--- a/drivers/infiniband/hw/ocrdma/ocrdma_stats.c ++++ b/drivers/infiniband/hw/ocrdma/ocrdma_stats.c +@@ -1,21 +1,36 @@ +-/******************************************************************* +- * This file is part of the Emulex RoCE Device Driver for * +- * RoCE (RDMA over Converged Ethernet) adapters. * +- * Copyright (C) 2008-2014 Emulex. All rights reserved. * +- * EMULEX and SLI are trademarks of Emulex. * +- * www.emulex.com * +- * * +- * This program is free software; you can redistribute it and/or * +- * modify it under the terms of version 2 of the GNU General * +- * Public License as published by the Free Software Foundation. * +- * This program is distributed in the hope that it will be useful. * +- * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND * +- * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, * +- * FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE * +- * DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD * +- * TO BE LEGALLY INVALID. See the GNU General Public License for * +- * more details, a copy of which can be found in the file COPYING * +- * included with this package. * ++/* This file is part of the Emulex RoCE Device Driver for ++ * RoCE (RDMA over Converged Ethernet) adapters. ++ * Copyright (C) 2012-2015 Emulex. All rights reserved. ++ * EMULEX and SLI are trademarks of Emulex. ++ * www.emulex.com ++ * ++ * 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. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE ++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR ++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF ++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR ++ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, ++ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR ++ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ++ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Contact Information: + * linux-drivers@emulex.com +@@ -23,7 +38,7 @@ + * Emulex + * 3333 Susan Street + * Costa Mesa, CA 92626 +- *******************************************************************/ ++ */ + + #include + #include +diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_stats.h b/drivers/infiniband/hw/ocrdma/ocrdma_stats.h +index 091edd6..c9e58d0 100644 +--- a/drivers/infiniband/hw/ocrdma/ocrdma_stats.h ++++ b/drivers/infiniband/hw/ocrdma/ocrdma_stats.h +@@ -1,21 +1,36 @@ +-/******************************************************************* +- * This file is part of the Emulex RoCE Device Driver for * +- * RoCE (RDMA over Converged Ethernet) adapters. * +- * Copyright (C) 2008-2014 Emulex. All rights reserved. * +- * EMULEX and SLI are trademarks of Emulex. * +- * www.emulex.com * +- * * +- * This program is free software; you can redistribute it and/or * +- * modify it under the terms of version 2 of the GNU General * +- * Public License as published by the Free Software Foundation. * +- * This program is distributed in the hope that it will be useful. * +- * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND * +- * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, * +- * FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE * +- * DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD * +- * TO BE LEGALLY INVALID. See the GNU General Public License for * +- * more details, a copy of which can be found in the file COPYING * +- * included with this package. * ++/* This file is part of the Emulex RoCE Device Driver for ++ * RoCE (RDMA over Converged Ethernet) adapters. ++ * Copyright (C) 2012-2015 Emulex. All rights reserved. ++ * EMULEX and SLI are trademarks of Emulex. ++ * www.emulex.com ++ * ++ * 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. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE ++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR ++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF ++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR ++ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, ++ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR ++ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ++ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Contact Information: + * linux-drivers@emulex.com +@@ -23,7 +38,7 @@ + * Emulex + * 3333 Susan Street + * Costa Mesa, CA 92626 +- *******************************************************************/ ++ */ + + #ifndef __OCRDMA_STATS_H__ + #define __OCRDMA_STATS_H__ +diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +index 669c846..736fee3 100644 +--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c ++++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +@@ -1,21 +1,36 @@ +-/******************************************************************* +- * This file is part of the Emulex RoCE Device Driver for * +- * RoCE (RDMA over Converged Ethernet) adapters. * +- * Copyright (C) 2008-2012 Emulex. All rights reserved. * +- * EMULEX and SLI are trademarks of Emulex. * +- * www.emulex.com * +- * * +- * This program is free software; you can redistribute it and/or * +- * modify it under the terms of version 2 of the GNU General * +- * Public License as published by the Free Software Foundation. * +- * This program is distributed in the hope that it will be useful. * +- * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND * +- * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, * +- * FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE * +- * DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD * +- * TO BE LEGALLY INVALID. See the GNU General Public License for * +- * more details, a copy of which can be found in the file COPYING * +- * included with this package. * ++/* This file is part of the Emulex RoCE Device Driver for ++ * RoCE (RDMA over Converged Ethernet) adapters. ++ * Copyright (C) 2012-2015 Emulex. All rights reserved. ++ * EMULEX and SLI are trademarks of Emulex. ++ * www.emulex.com ++ * ++ * 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. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE ++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR ++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF ++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR ++ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, ++ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR ++ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ++ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Contact Information: + * linux-drivers@emulex.com +@@ -23,7 +38,7 @@ + * Emulex + * 3333 Susan Street + * Costa Mesa, CA 92626 +- *******************************************************************/ ++ */ + + #include + #include +diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.h b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.h +index b8f7853..ce46d41 100644 +--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.h ++++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.h +@@ -1,21 +1,36 @@ +-/******************************************************************* +- * This file is part of the Emulex RoCE Device Driver for * +- * RoCE (RDMA over Converged Ethernet) adapters. * +- * Copyright (C) 2008-2012 Emulex. All rights reserved. * +- * EMULEX and SLI are trademarks of Emulex. * +- * www.emulex.com * +- * * +- * This program is free software; you can redistribute it and/or * +- * modify it under the terms of version 2 of the GNU General * +- * Public License as published by the Free Software Foundation. * +- * This program is distributed in the hope that it will be useful. * +- * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND * +- * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, * +- * FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE * +- * DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD * +- * TO BE LEGALLY INVALID. See the GNU General Public License for * +- * more details, a copy of which can be found in the file COPYING * +- * included with this package. * ++/* This file is part of the Emulex RoCE Device Driver for ++ * RoCE (RDMA over Converged Ethernet) adapters. ++ * Copyright (C) 2012-2015 Emulex. All rights reserved. ++ * EMULEX and SLI are trademarks of Emulex. ++ * www.emulex.com ++ * ++ * 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. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE ++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR ++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF ++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR ++ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, ++ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR ++ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ++ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Contact Information: + * linux-drivers@emulex.com +@@ -23,7 +38,7 @@ + * Emulex + * 3333 Susan Street + * Costa Mesa, CA 92626 +- *******************************************************************/ ++ */ + + #ifndef __OCRDMA_VERBS_H__ + #define __OCRDMA_VERBS_H__ +-- +1.7.1 + diff --git a/linux-next-pending/0022-RDMA-ocrdma-update-module-license-to-dual-license.patch b/linux-next-pending/0022-RDMA-ocrdma-update-module-license-to-dual-license.patch new file mode 100644 index 0000000..10aa46b --- /dev/null +++ b/linux-next-pending/0022-RDMA-ocrdma-update-module-license-to-dual-license.patch @@ -0,0 +1,29 @@ +From acfad873d7838141af32c0292166cd75aabbd75b Mon Sep 17 00:00:00 2001 +From: Devesh Sharma +Date: Thu, 4 Jun 2015 20:26:46 +0530 +Subject: [PATCH 2/2] RDMA/ocrdma: update module license to dual license + +This patch updates the ocrdma module license from GPL to +Dual BSD/GPL licensing. + +Signed-off-by: Devesh Sharma +--- + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c +index b2f4db0..8b1ceab 100644 +--- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c ++++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c +@@ -60,7 +60,7 @@ + MODULE_VERSION(OCRDMA_ROCE_DRV_VERSION); + MODULE_DESCRIPTION(OCRDMA_ROCE_DRV_DESC " " OCRDMA_ROCE_DRV_VERSION); + MODULE_AUTHOR("Emulex Corporation"); +-MODULE_LICENSE("GPL"); ++MODULE_LICENSE("Dual BSD/GPL"); + + static LIST_HEAD(ocrdma_dev_list); + static DEFINE_SPINLOCK(ocrdma_devlist_lock); +-- +1.7.1 + -- 2.41.0