Date: Mon, 26 Mar 2018 15:28:48 -0700 From: John Baldwin <jhb@freebsd.org> To: Hans Petter Selasky <hps@selasky.org> 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 Message-ID: <8157345.u3tjflj27M@ralph.baldwin.cx> 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>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <dev/mlx5/mlx5io.h> > > ^~~~~~~~~~~~~~~~~~~ > > 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?8157345.u3tjflj27M>