Date: Sat, 17 Mar 2012 18:55:38 +0100 From: Grzegorz Bernacki <gjb@semihalf.com> To: Konstantin Belousov <kostikbel@gmail.com> Cc: svn-src-projects@freebsd.org, Grzegorz Bernacki <gber@freebsd.org>, Pawel Jakub Dawidek <pjd@freebsd.org>, src-committers@freebsd.org Subject: Re: svn commit: r233075 - projects/nand/include Message-ID: <4F64D01A.8070100@semihalf.com> In-Reply-To: <20120317165353.GK75778@deviant.kiev.zoral.com.ua> References: <201203170331.q2H3VBou048384@svn.freebsd.org> <20120317085926.GE1340@garage.freebsd.pl> <20120317165353.GK75778@deviant.kiev.zoral.com.ua>
next in thread | previous in thread | raw e-mail | index | archive | help
W dniu 2012-03-17 17:53, Konstantin Belousov pisze: > 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/fix 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. Yes, I did few things wrong. Really sorry about it. Let me go through all the changes and fix them. grzesiek
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4F64D01A.8070100>