From owner-freebsd-arch@FreeBSD.ORG Tue Jul 6 03:46:56 2010 Return-Path: Delivered-To: freebsd-arch@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0B6C1106564A; Tue, 6 Jul 2010 03:46:56 +0000 (UTC) (envelope-from gordon.tetlow@gmail.com) Received: from mail-iw0-f182.google.com (mail-iw0-f182.google.com [209.85.214.182]) by mx1.freebsd.org (Postfix) with ESMTP id B5BBE8FC18; Tue, 6 Jul 2010 03:46:55 +0000 (UTC) Received: by iwn35 with SMTP id 35so4633593iwn.13 for ; Mon, 05 Jul 2010 20:46:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:sender:received :in-reply-to:references:date:x-google-sender-auth:message-id:subject :from:to:cc:content-type; bh=SxTB3eG8m+dqk8zgTLSWiB4DpxXE+r+cV5dpGQ28wBA=; b=F7A4tchAKw0ywN3yUgoIGvXdrCb/TFuk7hpUSkzBZkJQtw2wziwvlep6kxBQfDqSNl WGB867X5peV/GvDvDUdxEtMF71Bw+a7NGzzL2aleH0Tv2owTbLRQ/ox/hVDx2P9MPKzV Awl5sVDsFD8qqrleRunQrW9R0XeolyjxxZ1fs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; b=db6MNNK+M/Fe0OqGfkrFpu0JXZqtsRDdFKFSc6Y01M4WrZLcoqcqOd4UaB42NSOxak GaRJ9NKXMjTEJ6luMFwFGg30AtWiRXno/H1XdL4RtovQ1EQzjodckgjLWFZfu9cEvOoV 3hAd5Dos5HSRCDdS2Jl7f6eRK+wKY6pQrG/wg= MIME-Version: 1.0 Received: by 10.231.31.200 with SMTP id z8mr3937688ibc.90.1278386244663; Mon, 05 Jul 2010 20:17:24 -0700 (PDT) Sender: gordon.tetlow@gmail.com Received: by 10.231.160.205 with HTTP; Mon, 5 Jul 2010 20:17:24 -0700 (PDT) In-Reply-To: References: Date: Mon, 5 Jul 2010 20:17:24 -0700 X-Google-Sender-Auth: BNa8UmBbTqgw4CrMz9MlEV8nPxg Message-ID: From: Gordon Tetlow To: Rui Paulo Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: freebsd-arch@freebsd.org Subject: Re: Cleaning up the CDDL import mess X-BeenThere: freebsd-arch@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussion related to FreeBSD architecture List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Jul 2010 03:46:56 -0000 On Mon, Jul 5, 2010 at 11:56 AM, Rui Paulo wrote: > Right now we have four locations for CDDL import code: > > 1) vendor-cddl > 2) vendor/opensolaris > 3) vendor-sys/opensolaris > 4) and... HEAD itself. > > 1) vendor-cddl seems to be the first DTrace import and it's probably ready > to be svn rm'ed because it creates too much confusion. The first thing > someone who is looking at CDDL source is to probably look at vendor-cddl and > I would like to avoid this. > But I don't know what will happen to the mergeinfo in head/cddl and > head/sys/cddl (I think no harm will be done). > > 2 and 3) These are the correct locations IMHO and I know that jhb did move > the code here in the past. > > 4) The ZFS code lives in HEAD, unfortunately. I thought the policy was to > have a vendor import for vendor code so that we could merge *from* upstream > more easily. I was told that this is being done to some extent in Perforce, > but I don't know how acceptable this to the community. > > I need to import some DTrace code into 2 and 3, but I would like to svn rm > vendor-cddl, if there are no objections. > Sounds reasonable. I would clear it with cvsadm@ (is that the appropriate list these days?) on the mergeinfo question. Gordon