From owner-svn-src-all@FreeBSD.ORG Thu Jun 26 19:03:10 2014 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D7783959; Thu, 26 Jun 2014 19:03:10 +0000 (UTC) Received: from felyko.com (felyko.com [IPv6:2001:470:1:2d5:26:3:1337:ca7]) by mx1.freebsd.org (Postfix) with ESMTP id A8AE32CB4; Thu, 26 Jun 2014 19:03:10 +0000 (UTC) Received: from [10.47.9.81] (unknown [12.218.212.178]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by felyko.com (Postfix) with ESMTPSA id 727D534A9D5; Thu, 26 Jun 2014 12:02:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=felyko.com; s=mail; t=1403809380; bh=0RxFej1bISlfRYAd+0NEtihB7PuD4HuacQfj62gbW7c=; h=Subject:From:In-Reply-To:Date:Cc:References:To; b=LsvTeI1SfJk5gcca/aFhV7/S223dKXtjyRpgfu1oDrJV5KTjI2/pza5A1Q0I47x0O 8VYQLsSj+5UBQPDku+W0X1WvMuMNVrAnoS6dQCbGTvLmjR4jocBpGUwRexnsVALp2G IyeIE3aUqUgmG2/6qrh2znG50tr0GMmpu4oJ52CU= Mime-Version: 1.0 (1.0) Subject: Re: svn commit: r267898 - in head: cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs cddl/contrib/opensolaris/lib/libdtrace/common sys/cddl/contrib/opensolaris/uts/common/sys From: Rui Paulo X-Mailer: iPhone Mail (11D201) In-Reply-To: Date: Thu, 26 Jun 2014 12:02:55 -0700 Message-Id: <1C66CDB4-CB33-4B58-A924-8D66C33724A3@felyko.com> References: <201406260706.s5Q76hYW014217@svn.freebsd.org> <53ABC9FE.4000107@FreeBSD.org> To: Pedro Giffuni Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.18 Cc: "svn-src-head@FreeBSD.org" , "svn-src-all@FreeBSD.org" , "src-committers@FreeBSD.org" , Rui Paulo , Andriy Gapon X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jun 2014 19:03:10 -0000 I'll import the other versions for the sake of compatibility. Unfortunately o= ne of them is really specific to Solaris zones and doesn't get us anything.=20= -- Rui Paulo > On 26 Jun 2014, at 01:16, Pedro Giffuni wrote: >=20 >=20 >> Il giorno 26/giu/2014, alle ore 02:21, Andriy Gapon ha s= critto: >>=20 >>> On 26/06/2014 11:06, Rui Paulo wrote: >>> Author: rpaulo >>> Date: Thu Jun 26 07:06:43 2014 >>> New Revision: 267898 >>> URL: http://svnweb.freebsd.org/changeset/base/267898 >>>=20 >>> Log: >>> Bring the following change from the illumos-joyent repository: >>>=20 >>> commit 78e24ab6803bbe11ba37642624e1498ede5b239d >>> Author: Bryan Cantrill >>> Date: Thu Oct 31 01:20:54 2013 >>>=20 >>> OS-1688 DTrace count() with histogram >>> OS-2360 DTrace full width distribution histograms >>> OS-2361 DTrace frequency trails >>>=20 >>> MFC after: 2 weeks >>=20 >> Seems like this change is in illumos already: >>=20 >> commit 33093f5bcdc51014933497dd39374080c1ac5705 >> Author: Bryan Cantrill >> Date: Thu Oct 31 08:20:54 2013 +0000 >>=20 >> 4471 DTrace count() with histogram >> 4472 DTrace full width distribution histograms >> 4473 DTrace frequency trails >> Reviewed by: Dan McDonald >> Approved by: Gordon Ross >>=20 >> As such it would have been preferable to use our standard workflow and >> merge the change via the illumos vendor area. >>=20 >=20 > Indeed, this change is in the vendor area: >=20 > http://svnweb.freebsd.org/base?view=3Drevision&revision=3D266992 >=20 > However the commit is wrong because: >=20 > 1) It added files instead of copying them from/through the vendor area. > 2) It is not respecting the order in which upstream (Illumos AFAICT) adds f= eatures so it breaks the sense of DT_VERS_LATEST >=20 > I am aware that DTrace imports have not been respecting the regular mergin= g procedure but we are trying to work on that. Please fix at least (1), (2) i= mplies merging three commits that precede this one.=20 >=20 > Pedro.