From owner-svn-src-projects@FreeBSD.ORG Sat Mar 17 16:53:58 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7F426106564A; Sat, 17 Mar 2012 16:53:58 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from mail.zoral.com.ua (mx0.zoral.com.ua [91.193.166.200]) by mx1.freebsd.org (Postfix) with ESMTP id E2AF18FC14; Sat, 17 Mar 2012 16:53:57 +0000 (UTC) Received: from skuns.kiev.zoral.com.ua (localhost [127.0.0.1]) by mail.zoral.com.ua (8.14.2/8.14.2) with ESMTP id q2HGrrVw072231; Sat, 17 Mar 2012 18:53:53 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: from deviant.kiev.zoral.com.ua (kostik@localhost [127.0.0.1]) by deviant.kiev.zoral.com.ua (8.14.5/8.14.5) with ESMTP id q2HGrrvp002653; Sat, 17 Mar 2012 18:53:53 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by deviant.kiev.zoral.com.ua (8.14.5/8.14.5/Submit) id q2HGrr22002651; Sat, 17 Mar 2012 18:53:53 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: deviant.kiev.zoral.com.ua: kostik set sender to kostikbel@gmail.com using -f Date: Sat, 17 Mar 2012 18:53:53 +0200 From: Konstantin Belousov To: Pawel Jakub Dawidek Message-ID: <20120317165353.GK75778@deviant.kiev.zoral.com.ua> References: <201203170331.q2H3VBou048384@svn.freebsd.org> <20120317085926.GE1340@garage.freebsd.pl> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="7ECvgF33sQm7Ey2+" Content-Disposition: inline In-Reply-To: <20120317085926.GE1340@garage.freebsd.pl> User-Agent: Mutt/1.4.2.3i X-Virus-Scanned: clamav-milter 0.95.2 at skuns.kiev.zoral.com.ua X-Virus-Status: Clean X-Spam-Status: No, score=-4.0 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on skuns.kiev.zoral.com.ua Cc: svn-src-projects@freebsd.org, Grzegorz Bernacki , src-committers@freebsd.org Subject: Re: svn commit: r233075 - projects/nand/include X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Mar 2012 16:53:58 -0000 --7ECvgF33sQm7Ey2+ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Mar 17, 2012 at 09:59:26AM +0100, Pawel Jakub Dawidek wrote: > On Sat, Mar 17, 2012 at 03:31:11AM +0000, Grzegorz Bernacki wrote: > > Author: gber > > Date: Sat Mar 17 03:31:11 2012 > > New Revision: 233075 > > URL: http://svn.freebsd.org/changeset/base/233075 > >=20 > > Log: > > Install header files required by NANDFS > > =20 > > Obtained from: Semihalf > > Supported by: FreeBSD Foundation, Juniper Networks > >=20 > > Modified: > > projects/nand/include/Makefile > >=20 > > Modified: projects/nand/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=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > --- projects/nand/include/Makefile Sat Mar 17 03:28:37 2012 (r233074) > > +++ projects/nand/include/Makefile Sat Mar 17 03:31:11 2012 (r233075) > > @@ -43,7 +43,7 @@ LSUBDIRS=3D cam/ata cam/scsi \ > > dev/ic dev/iicbus ${_dev_ieee488} dev/io dev/lmc dev/mfi dev/ofw \ > > dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus \ > > dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \ > > - fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/nfs fs/ntfs fs/nullfs \ > > + fs/devfs fs/fdescfs fs/msdosfs fs/nandfs fs/nfs fs/ntfs fs/nullfs \ >=20 > You added nandfs, but removed fifofs. fifofs was removed earlier in head. I think this is badly done merge, and suggest inspecting the whole diff for unwanted changes. --7ECvgF33sQm7Ey2+ Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (FreeBSD) iEYEARECAAYFAk9kwaAACgkQC3+MBN1Mb4hJ7gCght0e+36wmRVwnTKJl8Skhn66 cEsAmQHKPB/TMmOUuMP0z8nbrlDxMPqy =Eked -----END PGP SIGNATURE----- --7ECvgF33sQm7Ey2+--