From owner-freebsd-current@FreeBSD.ORG Fri Feb 25 12:08:27 2011 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 811FB106564A for ; Fri, 25 Feb 2011 12:08:27 +0000 (UTC) (envelope-from olivier@gid0.org) Received: from mail-iy0-f182.google.com (mail-iy0-f182.google.com [209.85.210.182]) by mx1.freebsd.org (Postfix) with ESMTP id 50F7E8FC14 for ; Fri, 25 Feb 2011 12:08:27 +0000 (UTC) Received: by iyj12 with SMTP id 12so926249iyj.13 for ; Fri, 25 Feb 2011 04:08:26 -0800 (PST) MIME-Version: 1.0 Received: by 10.42.241.68 with SMTP id ld4mr650837icb.447.1298635706470; Fri, 25 Feb 2011 04:08:26 -0800 (PST) Received: by 10.231.149.79 with HTTP; Fri, 25 Feb 2011 04:08:26 -0800 (PST) In-Reply-To: <20110225113847.GB2042@muon.cran.org.uk> References: <20101213214556.GC2038@garage.freebsd.pl> <8662upxg76.fsf@gmail.com> <86lj1s3pv0.fsf@gmail.com> <1298621466.42510.1.camel@core.nessbank> <20110225113847.GB2042@muon.cran.org.uk> Date: Fri, 25 Feb 2011 13:08:26 +0100 Message-ID: From: Olivier Smedts To: Bruce Cran Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: Jason Garrett , freebsd-current Subject: Re: Next ZFSv28 patchset ready for testing. X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 12:08:27 -0000 2011/2/25 Bruce Cran : > On Fri, Feb 25, 2011 at 10:59:04AM +0100, Olivier Smedts wrote: >> >> Added ? The patch fails because the svn tag is not expanded, but what >> the patch does is remove the file. You can do so after patching if it >> failed. > > It looks like there are two patches to sysmacros.h - the first adds SIGNO= F and > highbit and the second then removes the file. Not the same sysmacros.h, the one patched is sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h, the other one you referenced (sys/cddl/compat/opensolaris/sys/sysmacros.h) is removed by the patch. BTW, even for the first one, I have no problem applying the patch cleanly on 9-CURRENT, svn revision 219027. --=20 Olivier Smedts=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=A0 _ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 ASCII ribbon campaign ( ) e-mail: olivier@gid0.org=A0 =A0 =A0 =A0 - against HTML email & vCards=A0 X www: http://www.gid0.org=A0 =A0 - against proprietary attachments / \ =A0 "Il y a seulement 10 sortes de gens dans le monde : =A0 ceux qui comprennent le binaire, =A0 et ceux qui ne le comprennent pas."