From owner-svn-src-stable@freebsd.org Mon Mar 26 22:28:58 2018 Return-Path: Delivered-To: svn-src-stable@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 06746F7166D; Mon, 26 Mar 2018 22:28:58 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from mail.baldwin.cx (bigwig.baldwin.cx [96.47.65.170]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A9F0C78567; Mon, 26 Mar 2018 22:28:57 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from ralph.baldwin.cx (ralph.baldwin.cx [66.234.199.215]) by mail.baldwin.cx (Postfix) with ESMTPSA id D331A10A87D; Mon, 26 Mar 2018 18:28:56 -0400 (EDT) From: John Baldwin To: Hans Petter Selasky Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: Re: svn commit: r331591 - stable/11/sys/dev/mlx5/mlx5_core Date: Mon, 26 Mar 2018 15:28:48 -0700 Message-ID: <8157345.u3tjflj27M@ralph.baldwin.cx> User-Agent: KMail/4.14.10 (FreeBSD/11.1-STABLE; KDE/4.14.30; amd64; ; ) In-Reply-To: <822e108c-160f-80b1-eedc-d5221f0b300d@selasky.org> References: <201803262106.w2QL6Ngg037236@repo.freebsd.org> <8910480.84UKvZQndd@ralph.baldwin.cx> <822e108c-160f-80b1-eedc-d5221f0b300d@selasky.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mail.baldwin.cx); Mon, 26 Mar 2018 18:28:56 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.99.2 at mail.baldwin.cx X-Virus-Status: Clean X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Mar 2018 22:28:58 -0000 On Tuesday, March 27, 2018 12:15:33 AM Hans Petter Selasky wrote: > On 03/27/18 00:04, John Baldwin wrote: > > On Monday, March 26, 2018 09:06:23 PM Hans Petter Selasky wrote: > >> Author: hselasky > >> Date: Mon Mar 26 21:06:23 2018 > >> New Revision: 331591 > >> URL: https://svnweb.freebsd.org/changeset/base/331591 > >> > >> Log: > >> MFC r330660: > >> Add call to setup firmware data dump structure during device load in > >> mlx5core. > >> > >> Do not consider the inability to create a firmware dump fatal, but > >> inform about the situation and allow the driver to attach. The device > >> might not implement the needed VSC, or we might not know the layout of > >> the registers map. In either case, only firmware dump functionality is > >> limited, the network operations should be fine. > >> > >> Submitted by: kib@ > >> Sponsored by: Mellanox Technologies > > > > Please batch up MFC commits at least enough to ensure they compile. We > > really should not be breaking the build on stable branches. If you are > > merging a commit that required followup fixes in head, the MFC needs to > > include those followup fixes. > > > > I'm getting this failure on a tree at this revision: > > > > /usr/src/usr.sbin/mlx5tool/mlx5tool.c:31:10: fatal error: 'dev/mlx5/mlx5io.h' file not found > > #include > > ^~~~~~~~~~~~~~~~~~~ > > 1 error generated. > > --- mlx5tool.o --- > > *** [mlx5tool.o] Error code 1 > > > > Hi, > > All the bits and pieces needed are part of: > > https://svnweb.freebsd.org/changeset/base/331586 > > I'll dig into it. I'm testing this now: Index: include/Makefile =================================================================== --- include/Makefile (revision 331591) +++ include/Makefile (working copy) @@ -254,7 +254,7 @@ ${DESTDIR}${INCLUDEDIR}/sys .endif .if ${MK_MLX5TOOL} != "no" - cd ${SRCTOP}/sys/dev/mlx5; \ + cd ${.CURDIR}/../sys/dev/mlx5; \ ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 mlx5io.h \ ${SDESTDIR}${INCLUDEDIR}/dev/mlx5 .endif However, you should at least do an amd64 buildworld/buildkernel on each MFC commit (I have bhyve VMs for amd64 and i386 on my desktop for testing MFCs). -- John Baldwin