From owner-svn-src-all@freebsd.org  Mon Jun  6 09:30:32 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B2F5CB6B4FB;
 Mon,  6 Jun 2016 09:30:32 +0000 (UTC)
 (envelope-from arybchik@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 mx1.freebsd.org (Postfix) with ESMTPS id 83F791207;
 Mon,  6 Jun 2016 09:30:32 +0000 (UTC)
 (envelope-from arybchik@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u569UV1Z054350;
 Mon, 6 Jun 2016 09:30:31 GMT (envelope-from arybchik@FreeBSD.org)
Received: (from arybchik@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u569UVku054349;
 Mon, 6 Jun 2016 09:30:31 GMT (envelope-from arybchik@FreeBSD.org)
Message-Id: <201606060930.u569UVku054349@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: arybchik set sender to
 arybchik@FreeBSD.org using -f
From: Andrew Rybchenko <arybchik@FreeBSD.org>
Date: Mon, 6 Jun 2016 09:30:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r301495 - head/sys/dev/sfxge/common
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Jun 2016 09:30:32 -0000

Author: arybchik
Date: Mon Jun  6 09:30:31 2016
New Revision: 301495
URL: https://svnweb.freebsd.org/changeset/base/301495

Log:
  sfxge(4): update TX vFIFO ULL tag location to avoid merge conflict
  
  Sponsored by:   Solarflare Communications, Inc.
  MFC after:      1 week

Modified:
  head/sys/dev/sfxge/common/ef10_tlv_layout.h

Modified: head/sys/dev/sfxge/common/ef10_tlv_layout.h
==============================================================================
--- head/sys/dev/sfxge/common/ef10_tlv_layout.h	Mon Jun  6 09:08:16 2016	(r301494)
+++ head/sys/dev/sfxge/common/ef10_tlv_layout.h	Mon Jun  6 09:30:31 2016	(r301495)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2012-2015 Solarflare Communications Inc.
+ * Copyright (c) 2012-2016 Solarflare Communications Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -801,7 +801,7 @@ struct tlv_tx_event_merging_config {
  * know if the low latency mode is enabled.
  */
 
-#define TLV_TAG_TX_VFIFO_ULL_MODE          (0x10220000)
+#define TLV_TAG_TX_VFIFO_ULL_MODE          (0x10270000)
 struct tlv_tx_vfifo_ull_mode {
   uint32_t tag;
   uint32_t length;