svn commit: r233075 - projects/nand/include

[Konstantin Belousov]

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
> > 
> > Log:
> >   Install header files required by NANDFS
> >   
> >   Obtained from: Semihalf
> >   Supported by:  FreeBSD Foundation, Juniper Networks
> > 
> > Modified:
> >   projects/nand/include/Makefile
> > 
> > Modified: projects/nand/include/Makefile
> > ==============================================================================
> > --- 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=	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 \
> 
> 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.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/svn-src-projects/attachments/20120317/cca7d3e2/attachment.pgp