From owner-svn-src-stable-11@freebsd.org  Thu Aug  2 08:34:01 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 9D90B105E52D;
 Thu,  2 Aug 2018 08:34:00 +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 52B4A7C0C3;
 Thu,  2 Aug 2018 08:34:00 +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 1913F7427;
 Thu,  2 Aug 2018 08:34:00 +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 w728Y0gE050401;
 Thu, 2 Aug 2018 08:34:00 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w728XqK6050355;
 Thu, 2 Aug 2018 08:33:52 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201808020833.w728XqK6050355@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: Thu, 2 Aug 2018 08:33:52 +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: r337096 - in stable/11/sys/ofed/drivers/infiniband: core
 ulp/ipoib
X-SVN-Group: stable-11
X-SVN-Commit-Author: hselasky
X-SVN-Commit-Paths: in stable/11/sys/ofed/drivers/infiniband: core ulp/ipoib
X-SVN-Commit-Revision: 337096
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.27
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: Thu, 02 Aug 2018 08:34:01 -0000

Author: hselasky
Date: Thu Aug  2 08:33:51 2018
New Revision: 337096
URL: https://svnweb.freebsd.org/changeset/base/337096

Log:
  MFC r336391:
  Use __FBSDID() for RCS tags in ibcore.
  
  Sponsored by:		Mellanox Technologies

Modified:
  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/ulp/ipoib/ipoib.h
  stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c
  stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
  stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_fs.c
  stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c
  stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
  stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
  stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
  stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_addr.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_addr.c	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_addr.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -33,9 +33,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$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <linux/mutex.h>
 #include <linux/inetdevice.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_agent.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_agent.c	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_agent.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -35,9 +35,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$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <linux/slab.h>
 #include <linux/string.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_cache.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_cache.c	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_cache.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -33,9 +33,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$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <linux/module.h>
 #include <linux/errno.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_cm.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_cm.c	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_cm.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -33,9 +33,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$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <linux/completion.h>
 #include <linux/dma-mapping.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_cma.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_cma.c	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_cma.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -33,9 +33,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$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$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	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_cq.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -30,9 +30,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$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <linux/module.h>
 #include <linux/err.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_device.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_device.c	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_device.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -31,9 +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$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <linux/module.h>
 #include <linux/string.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_fmr_pool.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_fmr_pool.c	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_fmr_pool.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -31,9 +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$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <linux/errno.h>
 #include <linux/spinlock.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_iwcm.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_iwcm.c	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_iwcm.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -35,9 +35,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$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <linux/dma-mapping.h>
 #include <linux/err.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_iwpm_msg.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_iwpm_msg.c	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_iwpm_msg.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -31,9 +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$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$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	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_iwpm_util.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -31,9 +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$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$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	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_mad.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -34,9 +34,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$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #define	LINUXKPI_PARAM_PREFIX ibcore_
 #define	KBUILD_MODNAME "ibcore"

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_mad_rmpp.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_mad_rmpp.c	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_mad_rmpp.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -32,9 +32,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$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$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	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_multicast.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -30,9 +30,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$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$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	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_packer.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -31,9 +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$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$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	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -30,9 +30,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$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$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	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_sa_query.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -32,9 +32,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$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <linux/module.h>
 #include <linux/err.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_smi.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_smi.c	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_smi.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -36,9 +36,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$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <rdma/ib_smi.h>
 #include "smi.h"

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_sysfs.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_sysfs.c	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_sysfs.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -32,9 +32,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$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$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	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_ucm.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -31,9 +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$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <linux/completion.h>
 #include <linux/fs.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_ucma.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_ucma.c	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_ucma.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -30,9 +30,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$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <linux/completion.h>
 #include <linux/file.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_ud_header.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_ud_header.c	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_ud_header.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -31,9 +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$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <linux/errno.h>
 #include <linux/string.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_umem.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_umem.c	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_umem.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -32,9 +32,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$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$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	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_umem_odp.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -30,9 +30,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$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <linux/types.h>
 #include <linux/sched.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_umem_rbtree.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_umem_rbtree.c	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_umem_rbtree.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -30,9 +30,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$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <linux/kernel.h>
 #include <linux/module.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_user_mad.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_user_mad.c	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_user_mad.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -33,9 +33,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$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$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	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_uverbs_cmd.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -33,9 +33,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$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$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	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_uverbs_main.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -34,9 +34,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$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <linux/module.h>
 #include <linux/device.h>

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_uverbs_marshall.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_uverbs_marshall.c	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_uverbs_marshall.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -30,9 +30,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$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$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	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_verbs.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -36,9 +36,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$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <linux/errno.h>
 #include <linux/err.h>

Modified: stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h	Thu Aug  2 08:33:51 2018	(r337096)
@@ -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 _IPOIB_H

Modified: stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -30,6 +30,9 @@
  * SOFTWARE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "ipoib.h"
 
 #ifdef CONFIG_INFINIBAND_IPOIB_CM

Modified: stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -30,6 +30,9 @@
  * SOFTWARE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
 

Modified: stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_fs.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_fs.c	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_fs.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -30,6 +30,9 @@
  * SOFTWARE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <linux/err.h>
 #include <linux/seq_file.h>
 

Modified: stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -33,6 +33,9 @@
  * SOFTWARE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "ipoib.h"
 
 #include <rdma/ib_cache.h>

Modified: stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -32,6 +32,9 @@
  * SOFTWARE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "ipoib.h"
 
 static	int ipoib_resolvemulti(struct ifnet *, struct sockaddr **,
@@ -318,8 +321,8 @@ ipoib_ioctl(struct ifnet *ifp, u_long command, caddr_t
 		break;
 
 	case SIOCGIFADDR:
-		bcopy(IF_LLADDR(ifp), &ifr->ifr_addr.sa_data[0],
-		    INFINIBAND_ALEN);
+			bcopy(IF_LLADDR(ifp), &ifr->ifr_addr.sa_data[0],
+                            INFINIBAND_ALEN);
 		break;
 
 	case SIOCSIFMTU:

Modified: stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -32,6 +32,9 @@
  * SOFTWARE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "ipoib.h"
 
 #include <linux/delay.h>

Modified: stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_verbs.c	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_verbs.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -31,6 +31,9 @@
  * SOFTWARE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "ipoib.h"
 
 int ipoib_mcast_attach(struct ipoib_dev_priv *priv, u16 mlid, union ib_gid *mgid, int set_qkey)

Modified: stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_vlan.c	Thu Aug  2 08:32:23 2018	(r337095)
+++ stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_vlan.c	Thu Aug  2 08:33:51 2018	(r337096)
@@ -30,6 +30,9 @@
  * SOFTWARE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <linux/module.h>
 
 #include <linux/init.h>