Date: Fri, 25 Feb 2011 13:08:26 +0100 From: Olivier Smedts <olivier@gid0.org> To: Bruce Cran <bruce@cran.org.uk> Cc: Jason Garrett <kingedgar@gmail.com>, freebsd-current <freebsd-current@freebsd.org> Subject: Re: Next ZFSv28 patchset ready for testing. Message-ID: <AANLkTik4n0uXFpJfYkEn6xPUiq10hqjsc-qhGGd4LaLP@mail.gmail.com> In-Reply-To: <20110225113847.GB2042@muon.cran.org.uk> References: <20101213214556.GC2038@garage.freebsd.pl> <8662upxg76.fsf@gmail.com> <86lj1s3pv0.fsf@gmail.com> <AANLkTi=WKdK2w7feTVXX28me6mmzFn0J1s8WWkRjA9Mi@mail.gmail.com> <AANLkTi=LMVwq7U1n8E3ZKLWpgZdB0LOf=FpCFCB9w_9e@mail.gmail.com> <1298621466.42510.1.camel@core.nessbank> <AANLkTinyUF4RWuHKdODHzy53regC11SLVyf3a9dHgAL_@mail.gmail.com> <20110225113847.GB2042@muon.cran.org.uk>
index | next in thread | previous in thread | raw e-mail
2011/2/25 Bruce Cran <bruce@cran.org.uk>: > 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 SIGNOF 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. -- Olivier Smedts _ ASCII ribbon campaign ( ) e-mail: olivier@gid0.org - against HTML email & vCards X www: http://www.gid0.org - against proprietary attachments / \ "Il y a seulement 10 sortes de gens dans le monde : ceux qui comprennent le binaire, et ceux qui ne le comprennent pas."help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AANLkTik4n0uXFpJfYkEn6xPUiq10hqjsc-qhGGd4LaLP>