From owner-svn-src-all@freebsd.org Fri Jun 10 04:55:50 2016 Return-Path: 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 49826B701DF; Fri, 10 Jun 2016 04:55:50 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 1FD971C7E; Fri, 10 Jun 2016 04:55:50 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from FreeBSD.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by freefall.freebsd.org (Postfix) with ESMTP id 345081AC1; Fri, 10 Jun 2016 04:55:49 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Date: Fri, 10 Jun 2016 04:55:32 +0000 From: Glen Barber To: Jung-uk Kim Cc: cem@freebsd.org, Warner Losh , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r301741 - head/sys/cam Message-ID: <20160610045532.GZ2323@FreeBSD.org> References: <201606091605.u59G5u1O037551@repo.freebsd.org> <20160610000055.GT2323@FreeBSD.org> <09e5d94f-e3ec-723b-cb5a-0d582bf1d804@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="LCbsoPZWBRMqE7TI" Content-Disposition: inline In-Reply-To: <09e5d94f-e3ec-723b-cb5a-0d582bf1d804@FreeBSD.org> X-Operating-System: FreeBSD 11.0-CURRENT amd64 X-SCUD-Definition: Sudden Completely Unexpected Dataloss X-SULE-Definition: Sudden Unexpected Learning Event X-PEKBAC-Definition: Problem Exists, Keyboard Between Admin/Computer User-Agent: Mutt/1.5.24 (2015-08-30) 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jun 2016 04:55:50 -0000 --LCbsoPZWBRMqE7TI Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jun 10, 2016 at 12:39:56AM -0400, Jung-uk Kim wrote: > On 06/ 9/16 08:35 PM, Conrad Meyer wrote: > > i386 as well (although we are replying to the wrong commit, I think > > r301771 is what broke it): > >=20 > > In file included from /usr/src/sbin/camcontrol/camcontrol.c:56: > > /usr/obj/usr/src/tmp/usr/include/cam/cam_ccb.h:44:10: fatal error: > > 'cam/nvme/nvme_all.h' file not found > > #include >=20 > The attached patch fixed the build problem for me. >=20 > FYI... Please commit. Glen >=20 > Jung-uk Kim >=20 > > Best, > > Conrad > >=20 > > On Thu, Jun 9, 2016 at 5:00 PM, Glen Barber wrote: > >> On Thu, Jun 09, 2016 at 04:05:56PM +0000, Warner Losh wrote: > >>> Author: imp > >>> Date: Thu Jun 9 16:05:56 2016 > >>> New Revision: 301741 > >>> URL: https://svnweb.freebsd.org/changeset/base/301741 > >>> > >>> Log: > >>> Add place holder for SDIO CAM stuff for CCB XPT type. > >>> > >> > >> One of these commits breaks sparc64. > >> > >> In file included from /usr/src/sbin/camcontrol/camcontrol.c:56: > >> /usr/obj/sparc64.sparc64/usr/src/tmp/usr/include/cam/cam_ccb.h:44:31: > >> error: cam/nvme/nvme_all.h: No such file or directory > >> In file included from /usr/src/sbin/camcontrol/camcontrol.c:56: > >> /usr/obj/sparc64.sparc64/usr/src/tmp/usr/include/cam/cam_ccb.h:794: > >> error: field 'cmd' has incomplete type > >> /usr/obj/sparc64.sparc64/usr/src/tmp/usr/include/cam/cam_ccb.h:795: > >> error: field 'cpl' has incomplete type > >> > >> Glen >=20 > Index: etc/mtree/BSD.include.dist > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- etc/mtree/BSD.include.dist (revision 301775) > +++ etc/mtree/BSD.include.dist (working copy) > @@ -90,6 +90,8 @@ > cam > ata > .. > + nvme > + .. > scsi > .. > .. > Index: include/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- include/Makefile (revision 301775) > +++ include/Makefile (working copy) > @@ -42,7 +42,7 @@ LHDRS=3D aio.h errno.h fcntl.h linker_set.h poll.h s > LDIRS=3D bsm cam geom net net80211 netgraph netinet netinet6 \ > netipsec netnatm netsmb nfs nfsclient nfsserver sys vm > =20 > -LSUBDIRS=3D cam/ata cam/scsi \ > +LSUBDIRS=3D cam/ata cam/nvme cam/scsi \ > dev/acpica dev/agp dev/an dev/bktr dev/ciss dev/filemon dev/firewire \ > dev/hwpmc \ > dev/ic dev/iicbus dev/io dev/lmc dev/mfi dev/nvme \ --LCbsoPZWBRMqE7TI Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXWkhEAAoJEAMUWKVHj+KT3vwP/2J+uUmQXLmy+ODzG8fZX4nW kr92N49zfGCi/7eIjmzAzhRLhusfAZ3OFjaBVmwChwSD89Kx3iJhyoRSNkYTAQB6 T7oFwMWMn6b/82TsxrEAaA672VXOAg8TRSGUmKaEpLgXRDboScbBx3853cOfi5ys XnkiPOuJGUbpi2WewU+D3N/YsCipS5eRLisqxZbjKxMeozxiCg3/1iVhv1dvRnkA v+TrduVJ/Lc7JR+96TobYkzDD0A6UHblIHvb3mAJCX7zo8TXnG3yj/rS3sz6dJdU bD8fXhG0zH/qyookRa+rcaySdd0P621edWeAqKZ5IMD1xKQaL/8ttn4WFAoPE7VU xsYMugrKdaGYtHfyBcJte4qVzl944b9ZAJhzf7iUhZiv4cRejhd/W9twdSvTZzKR UyZJ3et5tEZbL/7Sc/UcQrBUWxbPVII6iHLPY4Eq6uTar9tDt4Z70oGnDWVwtH4C Uner1HYGVD14eLovvl89x9jtaqoOTXBoZnYpYETN5fqwtQ8wwm3havYaE54D09nT g/WK8U1qf5QSdEwIHkYLs3UBNLULNRnQu0FXaGpzXbMnXwXe6WCM4W7og78i5Ety P4U4+cWepANvnczG80wsFNGe2wBtOGzuHV626J00stPZ6cW7fJJDuYvmFbjJ1A/e EPIoHUNzQZFE+UJps/C8 =WLKt -----END PGP SIGNATURE----- --LCbsoPZWBRMqE7TI--