From owner-freebsd-arch@FreeBSD.ORG Mon Jul 5 18:56:27 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 6FF0F106564A for ; Mon, 5 Jul 2010 18:56:27 +0000 (UTC) (envelope-from rpaulo@freebsd.org) Received: from karen.lavabit.com (karen.lavabit.com [72.249.41.33]) by mx1.freebsd.org (Postfix) with ESMTP id 16E488FC14 for ; Mon, 5 Jul 2010 18:56:26 +0000 (UTC) Received: from e.earth.lavabit.com (e.earth.lavabit.com [192.168.111.14]) by karen.lavabit.com (Postfix) with ESMTP id 592F511BA7A for ; Mon, 5 Jul 2010 13:56:25 -0500 (CDT) Received: from 10.0.10.3 (54.81.54.77.rev.vodafone.pt [77.54.81.54]) by lavabit.com with ESMTP id M30RC39SZR9E for ; Mon, 05 Jul 2010 13:56:22 -0500 From: Rui Paulo Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Date: Mon, 5 Jul 2010 19:56:19 +0100 Message-Id: To: freebsd-arch@freebsd.org Mime-Version: 1.0 (Apple Message framework v1081) X-Mailer: Apple Mail (2.1081) Subject: 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: Mon, 05 Jul 2010 18:56:27 -0000 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. Regards, -- Rui Paulo