From owner-svn-src-head@FreeBSD.ORG  Mon Jul  2 21:09:32 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 8FAAA106566B;
	Mon,  2 Jul 2012 21:09:32 +0000 (UTC) (envelope-from obrien@NUXI.org)
Received: from dragon.nuxi.org (trang.nuxi.org [74.95.12.85])
	by mx1.freebsd.org (Postfix) with ESMTP id 68A9A8FC08;
	Mon,  2 Jul 2012 21:09:32 +0000 (UTC)
Received: from dragon.nuxi.org (obrien@localhost [127.0.0.1])
	by dragon.nuxi.org (8.14.5/8.14.5) with ESMTP id q62L9V4j087490;
	Mon, 2 Jul 2012 14:09:31 -0700 (PDT)
	(envelope-from obrien@dragon.nuxi.org)
Received: (from obrien@localhost)
	by dragon.nuxi.org (8.14.5/8.14.5/Submit) id q62L9V6o087488;
	Mon, 2 Jul 2012 14:09:31 -0700 (PDT) (envelope-from obrien)
Date: Mon, 2 Jul 2012 14:09:31 -0700
From: "David O'Brien" <obrien@FreeBSD.org>
To: Doug Barton <dougb@FreeBSD.org>
Message-ID: <20120702210931.GB85618@dragon.NUXI.org>
References: <1340992732.19144.YahooMailClassic@web113501.mail.gq1.yahoo.com>
	<4FF11659.8060405@FreeBSD.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <4FF11659.8060405@FreeBSD.org>
X-Operating-System: FreeBSD 10.0-CURRENT
X-to-the-FBI-CIA-and-NSA: HI! HOW YA DOIN?
User-Agent: Mutt/1.5.20 (2009-06-14)
Cc: svn-src-head@FreeBSD.org, George Neville-Neil <gnn@neville-neil.com>,
	pfg@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org
Subject: Re: svn commit: r237624 - in head:
 cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize
 cddl/contrib/opensolaris/lib/libdtrace/common
 sys/cddl/contrib/opensolaris/uts/common/dtrace sys/cddl/c...
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: obrien@FreeBSD.org
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Jul 2012 21:09:32 -0000

On Sun, Jul 01, 2012 at 08:32:41PM -0700, Doug Barton wrote:
> On 06/29/2012 10:58, Pedro Giffuni wrote:
> > Now .. David pointed out I am not respecting the code
> > provenance since I didn't add them to the opensolaris
> > vendor area, but these files are copyrighted Joyent
> > Inc (not even Illumos) so I cannot put them there
> > unless we create a new vendor for Joyent
> 
> Creating a new vendor area would be the right solution, yes.

I totally disagree -- it will cause a real pain merging.

Think about it -- if we import a new code drop of uts/common/fs/zfs/*.c into
'^/vendor-sys/illumos', how do we merge that to HEAD?

I don't believe 'svn merge -c <GRN>' will work because we already have a
different uts/common/fs/zfs/*.c from ^/vendor-sys/opensolaris.

I think we either need to just call Illumos OpenSolaris for these
purposes, or 'svn move opensolaris illumos'.

I think this needs to be discussed with the Repo Meisters.

-- 
-- David  (obrien@FreeBSD.org)