From owner-freebsd-geom@FreeBSD.ORG Mon Mar 5 17:57:48 2007 Return-Path: X-Original-To: freebsd-geom@freebsd.org Delivered-To: freebsd-geom@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4984B16A41A for ; Mon, 5 Mar 2007 17:57:48 +0000 (UTC) (envelope-from pjd@garage.freebsd.pl) Received: from mail.garage.freebsd.pl (arm132.internetdsl.tpnet.pl [83.17.198.132]) by mx1.freebsd.org (Postfix) with ESMTP id D662013C481 for ; Mon, 5 Mar 2007 17:57:47 +0000 (UTC) (envelope-from pjd@garage.freebsd.pl) Received: by mail.garage.freebsd.pl (Postfix, from userid 65534) id BD474487FC; Mon, 5 Mar 2007 18:57:45 +0100 (CET) Received: from localhost (154.81.datacomsa.pl [195.34.81.154]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.garage.freebsd.pl (Postfix) with ESMTP id 2EFFF487FB; Mon, 5 Mar 2007 18:57:33 +0100 (CET) Date: Mon, 5 Mar 2007 18:56:19 +0100 From: Pawel Jakub Dawidek To: Andrei Kolu Message-ID: <20070305175619.GC1162@garage.freebsd.pl> References: <20070120073117.GB60202@x12.dk> <200703051727.19990.antik@bsd.ee> <20070305172731.GA1162@garage.freebsd.pl> <200703051952.12024.antik@bsd.ee> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="OBd5C1Lgu00Gd/Tn" Content-Disposition: inline In-Reply-To: <200703051952.12024.antik@bsd.ee> X-PGP-Key-URL: http://people.freebsd.org/~pjd/pjd.asc X-OS: FreeBSD 7.0-CURRENT i386 User-Agent: mutt-ng/devel-r804 (FreeBSD) X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on mail.garage.freebsd.pl X-Spam-Level: X-Spam-Status: No, score=-2.6 required=3.0 tests=BAYES_00 autolearn=ham version=3.0.4 Cc: freebsd-geom@freebsd.org Subject: Re: zfs_20070303.patch on current X-BeenThere: freebsd-geom@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: GEOM-specific discussions and implementations List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Mar 2007 17:57:48 -0000 --OBd5C1Lgu00Gd/Tn Content-Type: text/plain; charset=iso-8859-2 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Mar 05, 2007 at 07:52:11PM +0200, Andrei Kolu wrote: > On Monday 05 March 2007 7:27 pm, Pawel Jakub Dawidek wrote: > > On Mon, Mar 05, 2007 at 05:27:19PM +0200, Andrei Kolu wrote: > > > Stop in /usr/src/cddl/lib. > > > *** Error code 1 > > > > > > Stop in /usr/src/cddl. > > > > Don't patch patched source. The patch is against clean FreeBSD source > > from HEAD branch as of 03.03.2007. >=20 > I am patching clean source from 03.04.2007 >=20 > *default release=3Dcvs tag=3D. I'm afraid you don't. cvsup won't remove stuff you have in directories not under its control. Try removing the directories below: contrib/opensolaris compat/opensolaris sys/contrib/opensolaris sys/compat/opensolaris cddl sys/modules/zfs And then cvsup, patch, compile. --=20 Pawel Jakub Dawidek http://www.wheel.pl pjd@FreeBSD.org http://www.FreeBSD.org FreeBSD committer Am I Evil? Yes, I Am! --OBd5C1Lgu00Gd/Tn Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (FreeBSD) iD8DBQFF7FnDForvXbEpPzQRAgkfAKCEp1fmKIyjGidLE1W+7rFA71E55QCbBxeq JgnVlAI3mx9TXaDVWfiZVuA= =NnZh -----END PGP SIGNATURE----- --OBd5C1Lgu00Gd/Tn--