From owner-freebsd-stable@FreeBSD.ORG Tue May 19 20:26:53 2009 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2626C1065674 for ; Tue, 19 May 2009 20:26:53 +0000 (UTC) (envelope-from marck@rinet.ru) Received: from woozle.rinet.ru (woozle.rinet.ru [195.54.192.68]) by mx1.freebsd.org (Postfix) with ESMTP id 9A11D8FC12 for ; Tue, 19 May 2009 20:26:52 +0000 (UTC) (envelope-from marck@rinet.ru) Received: from localhost (localhost [127.0.0.1]) by woozle.rinet.ru (8.14.3/8.14.3) with ESMTP id n4JKQovx045881; Wed, 20 May 2009 00:26:50 +0400 (MSD) (envelope-from marck@rinet.ru) Date: Wed, 20 May 2009 00:26:50 +0400 (MSD) From: Dmitry Morozovsky To: Dimitry Andric In-Reply-To: Message-ID: References: <3c1674c90905151702l81c2b88off1d2b2ffed39ca2@mail.gmail.com> <4A11A666.3030407@andric.com> <4A12E929.4040406@andric.com> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) X-NCC-RegID: ru.rinet X-OpenPGP-Key-ID: 6B691B03 MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.2 (woozle.rinet.ru [0.0.0.0]); Wed, 20 May 2009 00:26:50 +0400 (MSD) Cc: freebsd-stable@freebsd.org Subject: Re: RFT: ZFS MFC X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 May 2009 20:26:54 -0000 On Wed, 20 May 2009, Dmitry Morozovsky wrote: DM> DM> DA> http://www.andric.com/freebsd/zfs13/r192269/zfs_mfc-r192269.diff.bz2 DM> DM> DA> DM> DM> DA> This diff should apply with no fuzz and no rejects to RELENG_7 as of DM> DM> DA> r192386 (2009-05-19 15:33:41 UTC). For earlier or later revisions, no DM> DM> DA> warranty. ;) DM> DM> DM> DM> Just to be sure: is the patch based on sys/ hierarchy, and does not touch DM> DM> others (like sbin/)? DM> DM> DM> DM> so, basically, DM> DM> DM> DM> cd /usr/src/sys && patch < /path/to/zfs-mfc.patch DM> DM> DM> DM> should be ok? DM> DM> Argh. Answering to myself: no. Even after ``patch -p1'' under /usr/src I got DM> DM> marck@moose:/usr/src> find . -iname '*rej' DM> ./sys/cddl/compat/opensolaris/sys/acl.h.rej DM> ./sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h.rej DM> ./sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S.rej DM> DM> Will investigate further... Aha, it seems first and third files are absent in your tree, and second is just $FreeBSD tag differ... Well, let's try to start compile phase ;) -- Sincerely, D.Marck [DM5020, MCK-RIPE, DM3-RIPN] [ FreeBSD committer: marck@FreeBSD.org ] ------------------------------------------------------------------------ *** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- marck@rinet.ru *** ------------------------------------------------------------------------