From owner-svn-src-stable-11@freebsd.org  Fri Mar 30 18:17:41 2018
Return-Path: <owner-svn-src-stable-11@freebsd.org>
Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B09FAF5366A;
 Fri, 30 Mar 2018 18:17:40 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 5D8CD74173;
 Fri, 30 Mar 2018 18:17:40 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5817347CB;
 Fri, 30 Mar 2018 18:17:40 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2UIHeKd066158;
 Fri, 30 Mar 2018 18:17:40 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2UIHYPQ066094;
 Fri, 30 Mar 2018 18:17:34 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201803301817.w2UIHYPQ066094@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: hselasky set sender to
 hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Fri, 30 Mar 2018 18:17:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r331772 - in stable/11/sys/ofed: drivers/infiniband/core
 include/rdma include/uapi/rdma
X-SVN-Group: stable-11
X-SVN-Commit-Author: hselasky
X-SVN-Commit-Paths: in stable/11/sys/ofed: drivers/infiniband/core
 include/rdma include/uapi/rdma
X-SVN-Commit-Revision: 331772
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-11@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for only the 11-stable src tree
 <svn-src-stable-11.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-11/>
List-Post: <mailto:svn-src-stable-11@freebsd.org>
List-Help: <mailto:svn-src-stable-11-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Mar 2018 18:17:41 -0000

Author: hselasky
Date: Fri Mar 30 18:17:33 2018
New Revision: 331772
URL: https://svnweb.freebsd.org/changeset/base/331772

Log:
  MFC r330490:
  Add missing FreeBSD tags and SVN properties to ibcore.
  
  Sponsored by:	Mellanox Technologies

Modified:
  stable/11/sys/ofed/drivers/infiniband/core/agent.h   (contents, props changed)
  stable/11/sys/ofed/drivers/infiniband/core/cm_msgs.h   (contents, props changed)
  stable/11/sys/ofed/drivers/infiniband/core/core_priv.h   (contents, props changed)
  stable/11/sys/ofed/drivers/infiniband/core/ib_addr.c
  stable/11/sys/ofed/drivers/infiniband/core/ib_agent.c
  stable/11/sys/ofed/drivers/infiniband/core/ib_cache.c
  stable/11/sys/ofed/drivers/infiniband/core/ib_cm.c
  stable/11/sys/ofed/drivers/infiniband/core/ib_cma.c
  stable/11/sys/ofed/drivers/infiniband/core/ib_cq.c
  stable/11/sys/ofed/drivers/infiniband/core/ib_device.c
  stable/11/sys/ofed/drivers/infiniband/core/ib_fmr_pool.c
  stable/11/sys/ofed/drivers/infiniband/core/ib_iwcm.c
  stable/11/sys/ofed/drivers/infiniband/core/ib_iwpm_msg.c
  stable/11/sys/ofed/drivers/infiniband/core/ib_iwpm_util.c
  stable/11/sys/ofed/drivers/infiniband/core/ib_mad.c
  stable/11/sys/ofed/drivers/infiniband/core/ib_mad_rmpp.c
  stable/11/sys/ofed/drivers/infiniband/core/ib_multicast.c
  stable/11/sys/ofed/drivers/infiniband/core/ib_packer.c
  stable/11/sys/ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c
  stable/11/sys/ofed/drivers/infiniband/core/ib_sa_query.c
  stable/11/sys/ofed/drivers/infiniband/core/ib_smi.c
  stable/11/sys/ofed/drivers/infiniband/core/ib_sysfs.c
  stable/11/sys/ofed/drivers/infiniband/core/ib_ucm.c
  stable/11/sys/ofed/drivers/infiniband/core/ib_ucma.c
  stable/11/sys/ofed/drivers/infiniband/core/ib_ud_header.c
  stable/11/sys/ofed/drivers/infiniband/core/ib_umem.c
  stable/11/sys/ofed/drivers/infiniband/core/ib_umem_odp.c
  stable/11/sys/ofed/drivers/infiniband/core/ib_umem_rbtree.c
  stable/11/sys/ofed/drivers/infiniband/core/ib_user_mad.c
  stable/11/sys/ofed/drivers/infiniband/core/ib_uverbs_cmd.c
  stable/11/sys/ofed/drivers/infiniband/core/ib_uverbs_main.c
  stable/11/sys/ofed/drivers/infiniband/core/ib_uverbs_marshall.c
  stable/11/sys/ofed/drivers/infiniband/core/ib_verbs.c
  stable/11/sys/ofed/drivers/infiniband/core/iwcm.h   (contents, props changed)
  stable/11/sys/ofed/drivers/infiniband/core/iwpm_util.h
  stable/11/sys/ofed/drivers/infiniband/core/mad_priv.h   (contents, props changed)
  stable/11/sys/ofed/drivers/infiniband/core/mad_rmpp.h   (contents, props changed)
  stable/11/sys/ofed/drivers/infiniband/core/opa_smi.h
  stable/11/sys/ofed/drivers/infiniband/core/sa.h   (contents, props changed)
  stable/11/sys/ofed/drivers/infiniband/core/smi.h   (contents, props changed)
  stable/11/sys/ofed/drivers/infiniband/core/uverbs.h   (contents, props changed)
  stable/11/sys/ofed/include/rdma/ib.h
  stable/11/sys/ofed/include/rdma/ib_addr.h   (contents, props changed)
  stable/11/sys/ofed/include/rdma/ib_cache.h   (contents, props changed)
  stable/11/sys/ofed/include/rdma/ib_cm.h   (contents, props changed)
  stable/11/sys/ofed/include/rdma/ib_fmr_pool.h   (contents, props changed)
  stable/11/sys/ofed/include/rdma/ib_hdrs.h
  stable/11/sys/ofed/include/rdma/ib_mad.h   (contents, props changed)
  stable/11/sys/ofed/include/rdma/ib_marshall.h   (contents, props changed)
  stable/11/sys/ofed/include/rdma/ib_pack.h   (contents, props changed)
  stable/11/sys/ofed/include/rdma/ib_pma.h   (contents, props changed)
  stable/11/sys/ofed/include/rdma/ib_sa.h   (contents, props changed)
  stable/11/sys/ofed/include/rdma/ib_smi.h   (contents, props changed)
  stable/11/sys/ofed/include/rdma/ib_umem.h   (contents, props changed)
  stable/11/sys/ofed/include/rdma/ib_umem_odp.h
  stable/11/sys/ofed/include/rdma/ib_verbs.h   (contents, props changed)
  stable/11/sys/ofed/include/rdma/iw_cm.h   (contents, props changed)
  stable/11/sys/ofed/include/rdma/iw_portmap.h
  stable/11/sys/ofed/include/rdma/opa_port_info.h
  stable/11/sys/ofed/include/rdma/opa_smi.h
  stable/11/sys/ofed/include/rdma/rdma_cm.h   (contents, props changed)
  stable/11/sys/ofed/include/rdma/rdma_cm_ib.h   (contents, props changed)
  stable/11/sys/ofed/include/rdma/rdma_vt.h
  stable/11/sys/ofed/include/rdma/rdmavt_cq.h
  stable/11/sys/ofed/include/rdma/rdmavt_mr.h
  stable/11/sys/ofed/include/rdma/rdmavt_qp.h
  stable/11/sys/ofed/include/uapi/rdma/ib_user_cm.h
  stable/11/sys/ofed/include/uapi/rdma/ib_user_mad.h
  stable/11/sys/ofed/include/uapi/rdma/ib_user_sa.h
  stable/11/sys/ofed/include/uapi/rdma/ib_user_verbs.h
  stable/11/sys/ofed/include/uapi/rdma/mlx4-abi.h
  stable/11/sys/ofed/include/uapi/rdma/mlx5-abi.h
  stable/11/sys/ofed/include/uapi/rdma/mthca-abi.h   (contents, props changed)
  stable/11/sys/ofed/include/uapi/rdma/rdma_user_cm.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/ofed/drivers/infiniband/core/agent.h
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/agent.h	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/agent.h	Fri Mar 30 18:17:33 2018	(r331772)
@@ -32,6 +32,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #ifndef __AGENT_H_

Modified: stable/11/sys/ofed/drivers/infiniband/core/cm_msgs.h
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/cm_msgs.h	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/cm_msgs.h	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2004, 2011 Intel Corporation.  All rights reserved.
  * Copyright (c) 2004 Topspin Corporation.  All rights reserved.
  * Copyright (c) 2004 Voltaire Corporation.  All rights reserved.
@@ -30,7 +32,10 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
+
 #if !defined(CM_MSGS_H)
 #define CM_MSGS_H
 

Modified: stable/11/sys/ofed/drivers/infiniband/core/core_priv.h
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/core_priv.h	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/core_priv.h	Fri Mar 30 18:17:33 2018	(r331772)
@@ -28,6 +28,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #ifndef _CORE_PRIV_H

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_addr.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_addr.c	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_addr.c	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2005 Voltaire Inc.  All rights reserved.
  * Copyright (c) 2002-2005, Network Appliance, Inc. All rights reserved.
  * Copyright (c) 1999-2005, Mellanox Technologies, Inc. All rights reserved.
@@ -31,6 +33,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #include <linux/mutex.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_agent.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_agent.c	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_agent.c	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2004, 2005 Mellanox Technologies Ltd.  All rights reserved.
  * Copyright (c) 2004, 2005 Infinicon Corporation.  All rights reserved.
  * Copyright (c) 2004, 2005 Intel Corporation.  All rights reserved.
@@ -34,6 +36,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
+ * $FreeBSD$
  */
 
 #include <linux/slab.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_cache.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_cache.c	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_cache.c	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2004 Topspin Communications.  All rights reserved.
  * Copyright (c) 2005 Intel Corporation. All rights reserved.
  * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
@@ -31,6 +33,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #include <linux/module.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_cm.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_cm.c	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_cm.c	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2004-2007 Intel Corporation.  All rights reserved.
  * Copyright (c) 2004 Topspin Corporation.  All rights reserved.
  * Copyright (c) 2004, 2005 Voltaire Corporation.  All rights reserved.
@@ -31,6 +33,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #include <linux/completion.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_cma.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_cma.c	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_cma.c	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2005 Voltaire Inc.  All rights reserved.
  * Copyright (c) 2002-2005, Network Appliance, Inc. All rights reserved.
  * Copyright (c) 1999-2005, Mellanox Technologies, Inc. All rights reserved.
@@ -31,6 +33,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #define	LINUXKPI_PARAM_PREFIX ibcore_

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_cq.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_cq.c	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_cq.c	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2017 Mellanox Technologies Ltd.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
@@ -28,6 +30,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #include <linux/module.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_device.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_device.c	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_device.c	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2004 Topspin Communications.  All rights reserved.
  * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
  *
@@ -29,6 +31,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #include <linux/module.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_fmr_pool.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_fmr_pool.c	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_fmr_pool.c	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2004 Topspin Communications.  All rights reserved.
  * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
  *
@@ -29,6 +31,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #include <linux/errno.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_iwcm.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_iwcm.c	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_iwcm.c	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2004, 2005 Intel Corporation.  All rights reserved.
  * Copyright (c) 2004 Topspin Corporation.  All rights reserved.
  * Copyright (c) 2004, 2005 Voltaire Corporation.  All rights reserved.
@@ -34,7 +36,9 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
+ * $FreeBSD$
  */
+
 #include <linux/dma-mapping.h>
 #include <linux/err.h>
 #include <linux/idr.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_iwpm_msg.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_iwpm_msg.c	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_iwpm_msg.c	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2014 Intel Corporation. All rights reserved.
  * Copyright (c) 2014 Chelsio, Inc. All rights reserved.
  *
@@ -29,6 +31,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #include "iwpm_util.h"

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_iwpm_util.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_iwpm_util.c	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_iwpm_util.c	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2014 Chelsio, Inc. All rights reserved.
  * Copyright (c) 2014 Intel Corporation. All rights reserved.
  *
@@ -29,6 +31,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #include "iwpm_util.h"

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_mad.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_mad.c	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_mad.c	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2004-2007 Voltaire, Inc. All rights reserved.
  * Copyright (c) 2005 Intel Corporation.  All rights reserved.
  * Copyright (c) 2005 Mellanox Technologies Ltd.  All rights reserved.
@@ -33,6 +35,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
+ * $FreeBSD$
  */
 
 #define	LINUXKPI_PARAM_PREFIX ibcore_

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_mad_rmpp.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_mad_rmpp.c	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_mad_rmpp.c	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2005 Intel Inc. All rights reserved.
  * Copyright (c) 2005-2006 Voltaire, Inc. All rights reserved.
  * Copyright (c) 2014 Intel Corporation.  All rights reserved.
@@ -30,6 +32,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #include <linux/slab.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_multicast.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_multicast.c	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_multicast.c	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2006 Intel Corporation.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
@@ -28,6 +30,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #define	LINUXKPI_PARAM_PREFIX ibcore_

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_packer.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_packer.c	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_packer.c	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2004 Topspin Corporation.  All rights reserved.
  * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
  *
@@ -29,6 +31,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #include <linux/string.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2015-2017, Mellanox Technologies inc.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
@@ -28,6 +30,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #include "core_priv.h"

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_sa_query.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_sa_query.c	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_sa_query.c	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2004 Topspin Communications.  All rights reserved.
  * Copyright (c) 2005 Voltaire, Inc.  All rights reserved.
  * Copyright (c) 2006 Intel Corporation.  All rights reserved.
@@ -30,6 +32,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #include <linux/module.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_smi.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_smi.c	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_smi.c	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2004, 2005 Mellanox Technologies Ltd.  All rights reserved.
  * Copyright (c) 2004, 2005 Infinicon Corporation.  All rights reserved.
  * Copyright (c) 2004, 2005 Intel Corporation.  All rights reserved.
@@ -35,6 +37,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
+ * $FreeBSD$
  */
 
 #include <rdma/ib_smi.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_sysfs.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_sysfs.c	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_sysfs.c	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2004, 2005 Topspin Communications.  All rights reserved.
  * Copyright (c) 2005 Mellanox Technologies Ltd.  All rights reserved.
  * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
@@ -30,6 +32,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #include "core_priv.h"

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_ucm.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_ucm.c	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_ucm.c	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2005 Topspin Communications.  All rights reserved.
  * Copyright (c) 2005 Intel Corporation.  All rights reserved.
  *
@@ -29,6 +31,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #include <linux/completion.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_ucma.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_ucma.c	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_ucma.c	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2005-2006 Intel Corporation.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
@@ -28,6 +30,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #include <linux/completion.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_ud_header.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_ud_header.c	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_ud_header.c	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2004 Topspin Corporation.  All rights reserved.
  * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
  *
@@ -29,6 +31,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #include <linux/errno.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_umem.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_umem.c	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_umem.c	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2005 Topspin Communications.  All rights reserved.
  * Copyright (c) 2005 Cisco Systems.  All rights reserved.
  * Copyright (c) 2005 Mellanox Technologies. All rights reserved.
@@ -30,6 +32,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #define	LINUXKPI_PARAM_PREFIX ibcore_

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_umem_odp.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_umem_odp.c	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_umem_odp.c	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2014 Mellanox Technologies. All rights reserved.
  *
  * This software is available to you under a choice of one of two
@@ -28,6 +30,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #include <linux/types.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_umem_rbtree.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_umem_rbtree.c	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_umem_rbtree.c	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2014 Mellanox Technologies. All rights reserved.
  *
  * This software is available to you under a choice of one of two
@@ -28,6 +30,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #include <linux/kernel.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_user_mad.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_user_mad.c	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_user_mad.c	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2004 Topspin Communications.  All rights reserved.
  * Copyright (c) 2005 Voltaire, Inc. All rights reserved.
  * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
@@ -31,6 +33,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #define pr_fmt(fmt) "user_mad: " fmt

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_uverbs_cmd.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_uverbs_cmd.c	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_uverbs_cmd.c	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2005 Topspin Communications.  All rights reserved.
  * Copyright (c) 2005, 2006, 2007 Cisco Systems.  All rights reserved.
  * Copyright (c) 2005 PathScale, Inc.  All rights reserved.
@@ -31,6 +33,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #define	LINUXKPI_PARAM_PREFIX ibcore_

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_uverbs_main.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_uverbs_main.c	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_uverbs_main.c	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2005 Topspin Communications.  All rights reserved.
  * Copyright (c) 2005, 2006 Cisco Systems.  All rights reserved.
  * Copyright (c) 2005 Mellanox Technologies. All rights reserved.
@@ -32,6 +34,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #include <linux/module.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_uverbs_marshall.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_uverbs_marshall.c	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_uverbs_marshall.c	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2005 Intel Corporation.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
@@ -28,6 +30,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #include <rdma/ib_marshall.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_verbs.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_verbs.c	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_verbs.c	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2004 Mellanox Technologies Ltd.  All rights reserved.
  * Copyright (c) 2004 Infinicon Corporation.  All rights reserved.
  * Copyright (c) 2004 Intel Corporation.  All rights reserved.
@@ -34,6 +36,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #include <linux/errno.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/iwcm.h
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/iwcm.h	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/iwcm.h	Fri Mar 30 18:17:33 2018	(r331772)
@@ -29,7 +29,10 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
+
 #ifndef IWCM_H
 #define IWCM_H
 

Modified: stable/11/sys/ofed/drivers/infiniband/core/iwpm_util.h
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/iwpm_util.h	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/iwpm_util.h	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2014 Intel Corporation. All rights reserved.
  * Copyright (c) 2014 Chelsio, Inc. All rights reserved.
  *
@@ -29,7 +31,10 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
+
 #ifndef _IWPM_UTIL_H
 #define _IWPM_UTIL_H
 

Modified: stable/11/sys/ofed/drivers/infiniband/core/mad_priv.h
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/mad_priv.h	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/mad_priv.h	Fri Mar 30 18:17:33 2018	(r331772)
@@ -31,6 +31,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #ifndef __IB_MAD_PRIV_H__

Modified: stable/11/sys/ofed/drivers/infiniband/core/mad_rmpp.h
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/mad_rmpp.h	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/mad_rmpp.h	Fri Mar 30 18:17:33 2018	(r331772)
@@ -28,6 +28,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #ifndef __MAD_RMPP_H__

Modified: stable/11/sys/ofed/drivers/infiniband/core/opa_smi.h
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/opa_smi.h	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/opa_smi.h	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2014 Intel Corporation.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
@@ -29,6 +31,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
+ * $FreeBSD$
  */
 
 #ifndef __OPA_SMI_H_

Modified: stable/11/sys/ofed/drivers/infiniband/core/sa.h
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/sa.h	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/sa.h	Fri Mar 30 18:17:33 2018	(r331772)
@@ -30,6 +30,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #ifndef SA_H

Modified: stable/11/sys/ofed/drivers/infiniband/core/smi.h
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/smi.h	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/smi.h	Fri Mar 30 18:17:33 2018	(r331772)
@@ -33,6 +33,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
+ * $FreeBSD$
  */
 
 #ifndef __SMI_H_

Modified: stable/11/sys/ofed/drivers/infiniband/core/uverbs.h
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/uverbs.h	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/drivers/infiniband/core/uverbs.h	Fri Mar 30 18:17:33 2018	(r331772)
@@ -32,6 +32,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #ifndef UVERBS_H

Modified: stable/11/sys/ofed/include/rdma/ib.h
==============================================================================
--- stable/11/sys/ofed/include/rdma/ib.h	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/include/rdma/ib.h	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2010 Intel Corporation.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
@@ -28,6 +30,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #if !defined(_RDMA_IB_H)

Modified: stable/11/sys/ofed/include/rdma/ib_addr.h
==============================================================================
--- stable/11/sys/ofed/include/rdma/ib_addr.h	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/include/rdma/ib_addr.h	Fri Mar 30 18:17:33 2018	(r331772)
@@ -29,6 +29,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #if !defined(IB_ADDR_H)

Modified: stable/11/sys/ofed/include/rdma/ib_cache.h
==============================================================================
--- stable/11/sys/ofed/include/rdma/ib_cache.h	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/include/rdma/ib_cache.h	Fri Mar 30 18:17:33 2018	(r331772)
@@ -30,6 +30,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #ifndef _IB_CACHE_H

Modified: stable/11/sys/ofed/include/rdma/ib_cm.h
==============================================================================
--- stable/11/sys/ofed/include/rdma/ib_cm.h	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/include/rdma/ib_cm.h	Fri Mar 30 18:17:33 2018	(r331772)
@@ -31,7 +31,10 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
+
 #if !defined(IB_CM_H)
 #define IB_CM_H
 

Modified: stable/11/sys/ofed/include/rdma/ib_fmr_pool.h
==============================================================================
--- stable/11/sys/ofed/include/rdma/ib_fmr_pool.h	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/include/rdma/ib_fmr_pool.h	Fri Mar 30 18:17:33 2018	(r331772)
@@ -29,6 +29,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #if !defined(IB_FMR_POOL_H)

Modified: stable/11/sys/ofed/include/rdma/ib_hdrs.h
==============================================================================
--- stable/11/sys/ofed/include/rdma/ib_hdrs.h	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/include/rdma/ib_hdrs.h	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright(c) 2016 Intel Corporation.
  *
  * This file is provided under a dual BSD/GPLv2 license.  When using or
@@ -43,6 +45,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
+ * $FreeBSD$
  */
 
 #ifndef IB_HDRS_H

Modified: stable/11/sys/ofed/include/rdma/ib_mad.h
==============================================================================
--- stable/11/sys/ofed/include/rdma/ib_mad.h	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/include/rdma/ib_mad.h	Fri Mar 30 18:17:33 2018	(r331772)
@@ -32,6 +32,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #if !defined(IB_MAD_H)

Modified: stable/11/sys/ofed/include/rdma/ib_marshall.h
==============================================================================
--- stable/11/sys/ofed/include/rdma/ib_marshall.h	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/include/rdma/ib_marshall.h	Fri Mar 30 18:17:33 2018	(r331772)
@@ -28,6 +28,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #if !defined(IB_USER_MARSHALL_H)

Modified: stable/11/sys/ofed/include/rdma/ib_pack.h
==============================================================================
--- stable/11/sys/ofed/include/rdma/ib_pack.h	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/include/rdma/ib_pack.h	Fri Mar 30 18:17:33 2018	(r331772)
@@ -28,6 +28,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #ifndef IB_PACK_H

Modified: stable/11/sys/ofed/include/rdma/ib_pma.h
==============================================================================
--- stable/11/sys/ofed/include/rdma/ib_pma.h	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/include/rdma/ib_pma.h	Fri Mar 30 18:17:33 2018	(r331772)
@@ -30,6 +30,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #if !defined(IB_PMA_H)

Modified: stable/11/sys/ofed/include/rdma/ib_sa.h
==============================================================================
--- stable/11/sys/ofed/include/rdma/ib_sa.h	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/include/rdma/ib_sa.h	Fri Mar 30 18:17:33 2018	(r331772)
@@ -30,6 +30,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #ifndef IB_SA_H

Modified: stable/11/sys/ofed/include/rdma/ib_smi.h
==============================================================================
--- stable/11/sys/ofed/include/rdma/ib_smi.h	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/include/rdma/ib_smi.h	Fri Mar 30 18:17:33 2018	(r331772)
@@ -32,6 +32,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #if !defined(IB_SMI_H)

Modified: stable/11/sys/ofed/include/rdma/ib_umem.h
==============================================================================
--- stable/11/sys/ofed/include/rdma/ib_umem.h	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/include/rdma/ib_umem.h	Fri Mar 30 18:17:33 2018	(r331772)
@@ -28,6 +28,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #ifndef IB_UMEM_H

Modified: stable/11/sys/ofed/include/rdma/ib_umem_odp.h
==============================================================================
--- stable/11/sys/ofed/include/rdma/ib_umem_odp.h	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/include/rdma/ib_umem_odp.h	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2014 Mellanox Technologies. All rights reserved.
  *
  * This software is available to you under a choice of one of two
@@ -28,6 +30,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #ifndef IB_UMEM_ODP_H

Modified: stable/11/sys/ofed/include/rdma/ib_verbs.h
==============================================================================
--- stable/11/sys/ofed/include/rdma/ib_verbs.h	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/include/rdma/ib_verbs.h	Fri Mar 30 18:17:33 2018	(r331772)
@@ -34,6 +34,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #if !defined(IB_VERBS_H)

Modified: stable/11/sys/ofed/include/rdma/iw_cm.h
==============================================================================
--- stable/11/sys/ofed/include/rdma/iw_cm.h	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/include/rdma/iw_cm.h	Fri Mar 30 18:17:33 2018	(r331772)
@@ -29,7 +29,10 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
+
 #ifndef IW_CM_H
 #define IW_CM_H
 

Modified: stable/11/sys/ofed/include/rdma/iw_portmap.h
==============================================================================
--- stable/11/sys/ofed/include/rdma/iw_portmap.h	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/include/rdma/iw_portmap.h	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2014 Intel Corporation. All rights reserved.
  * Copyright (c) 2014 Chelsio, Inc. All rights reserved.
  *
@@ -29,7 +31,10 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
+
 #ifndef _IW_PORTMAP_H
 #define _IW_PORTMAP_H
 

Modified: stable/11/sys/ofed/include/rdma/opa_port_info.h
==============================================================================
--- stable/11/sys/ofed/include/rdma/opa_port_info.h	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/include/rdma/opa_port_info.h	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2014 Intel Corporation.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
@@ -28,6 +30,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #if !defined(OPA_PORT_INFO_H)

Modified: stable/11/sys/ofed/include/rdma/opa_smi.h
==============================================================================
--- stable/11/sys/ofed/include/rdma/opa_smi.h	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/include/rdma/opa_smi.h	Fri Mar 30 18:17:33 2018	(r331772)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause OR GPL-2.0
+ *
  * Copyright (c) 2014 Intel Corporation.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
@@ -28,6 +30,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #if !defined(OPA_SMI_H)

Modified: stable/11/sys/ofed/include/rdma/rdma_cm.h
==============================================================================
--- stable/11/sys/ofed/include/rdma/rdma_cm.h	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/include/rdma/rdma_cm.h	Fri Mar 30 18:17:33 2018	(r331772)
@@ -29,6 +29,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #if !defined(RDMA_CM_H)

Modified: stable/11/sys/ofed/include/rdma/rdma_cm_ib.h
==============================================================================
--- stable/11/sys/ofed/include/rdma/rdma_cm_ib.h	Fri Mar 30 18:13:44 2018	(r331771)
+++ stable/11/sys/ofed/include/rdma/rdma_cm_ib.h	Fri Mar 30 18:17:33 2018	(r331772)
@@ -28,6 +28,8 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
+ *
+ * $FreeBSD$
  */
 

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***