Date: Sat, 17 Mar 2012 18:53:53 +0200 From: Konstantin Belousov <kostikbel@gmail.com> To: Pawel Jakub Dawidek <pjd@freebsd.org> Cc: svn-src-projects@freebsd.org, Grzegorz Bernacki <gber@freebsd.org>, src-committers@freebsd.org Subject: Re: svn commit: r233075 - projects/nand/include Message-ID: <20120317165353.GK75778@deviant.kiev.zoral.com.ua> In-Reply-To: <20120317085926.GE1340@garage.freebsd.pl> References: <201203170331.q2H3VBou048384@svn.freebsd.org> <20120317085926.GE1340@garage.freebsd.pl>
next in thread | previous in thread | raw e-mail | index | archive | help
--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+--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120317165353.GK75778>