From owner-svn-src-projects@FreeBSD.ORG Sat Mar 17 17:55:49 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5DBCB1065674; Sat, 17 Mar 2012 17:55:49 +0000 (UTC) (envelope-from gjb@semihalf.com) Received: from smtp.semihalf.com (smtp.semihalf.com [213.17.239.109]) by mx1.freebsd.org (Postfix) with ESMTP id 075A28FC08; Sat, 17 Mar 2012 17:55:48 +0000 (UTC) Received: from localhost (unknown [213.17.239.109]) by smtp.semihalf.com (Postfix) with ESMTP id 8233AEC2EB; Sat, 17 Mar 2012 18:55:34 +0100 (CET) X-Virus-Scanned: by amavisd-new at semihalf.com Received: from smtp.semihalf.com ([213.17.239.109]) by localhost (smtp.semihalf.com [213.17.239.109]) (amavisd-new, port 10024) with ESMTP id qxlDX2Nd3lNX; Sat, 17 Mar 2012 18:55:33 +0100 (CET) Received: from [172.17.136.194] (adsl-64-175-228-30.dsl.sntc01.pacbell.net [64.175.228.30]) by smtp.semihalf.com (Postfix) with ESMTPSA id DD7FEEC2E9; Sat, 17 Mar 2012 18:55:31 +0100 (CET) Message-ID: <4F64D01A.8070100@semihalf.com> Date: Sat, 17 Mar 2012 18:55:38 +0100 From: Grzegorz Bernacki User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:10.0.2) Gecko/20120216 Thunderbird/10.0.2 MIME-Version: 1.0 To: Konstantin Belousov References: <201203170331.q2H3VBou048384@svn.freebsd.org> <20120317085926.GE1340@garage.freebsd.pl> <20120317165353.GK75778@deviant.kiev.zoral.com.ua> In-Reply-To: <20120317165353.GK75778@deviant.kiev.zoral.com.ua> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-projects@freebsd.org, Grzegorz Bernacki , Pawel Jakub Dawidek , 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 17:55:49 -0000 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