[rdma-core,02/17] Update COPYING to reflect recent cxgb4 merge

Commit Message

Jason Gunthorpe Oct. 6, 2016, 8:51 p.m. UTC

queue.h is gone and all files have a copying header.

Signed-off-by: Jason Gunthorpe <[e-mail]>
---
 COPYING.md       |  7 +------
 libcxgb4/COPYING | 29 -----------------------------
 2 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 libcxgb4/COPYING

diff --git a/libcxgb4/COPYING b/libcxgb4/COPYING
deleted file mode 100644
index 93b666faf583..000000000000

Comments

Steve Wise Oct. 6, 2016, 9:31 p.m. UTC | #1

Acked-by: Steve Wise <[e-mail]

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/COPYING.md b/COPYING.md
index d3a3919dc2d4..3d55eb9f5ef1 100644
--- a/COPYING.md
+++ b/COPYING.md
@@ -1,7 +1,7 @@ 
 # Default Dual License
 
 Unless otherwise stated 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 the
+one of two licenses.  You may choose to be licensed under the terms of the
 OpenIB.org BSD (MIT variant) license (see COPYING.BSD_MIT) or the GNU General
 Public License (GPL) Version 2 (see COPYING.GPL2), both included in this
 package.
@@ -36,11 +36,6 @@  several licenses:
 The following providers use a different license than the Default Dual
 License. Refer to files in each directory for details.
 
-cxbg4
-: A combination of the
-    - Default Dual License
-    - cxgb4/src/queue.h: BSD 3 clause license.
-
 hfi1verbs
 : Dual License: GPLv2 or Intel 3 clause BSD license