From owner-freebsd-arch@FreeBSD.ORG Tue Jul 3 14:55:19 2012 Return-Path: Delivered-To: arch@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BB8521065673 for ; Tue, 3 Jul 2012 14:55:19 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from mail-yx0-f182.google.com (mail-yx0-f182.google.com [209.85.213.182]) by mx1.freebsd.org (Postfix) with ESMTP id 6CCCB8FC17 for ; Tue, 3 Jul 2012 14:55:19 +0000 (UTC) Received: by yenl8 with SMTP id l8so6338090yen.13 for ; Tue, 03 Jul 2012 07:55:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:subject:mime-version:content-type:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to:x-mailer :x-gm-message-state; bh=8BM6rl1jlQ/IHmdK4/lYQoEIktjkHxpq1Ia4MUf++cw=; b=LrpgUKrE70GjUUYhAl1a53ZD9scqDjrPiVcCKQaXGmvLvtnq+7dCsuKTD2pDADdoPY jHHr33kiCCXEoump5lHrq6hUg8pPhiYfMbzSlQtRZAYBbm+sYtbxK0vxs6IJgd8T/2F7 7HnOn2IRU8/F9Wj4EzNnaIoJuOVgS4Q4UVbtcG1ur6/2mSF7/WhtKO1MymbwhIGsPQ6i QrghYDsAsnWqimKArEJa09IDesyHEaQjOij2ZkpYjIMm96UORkoFUkaIajRag+yQP81N Z0Kj6djx3OrGuBNsB8zGx9ewOc/0LiUKSLQKJuO8nuo15DeZP2QBKtcA8TRzMKm5FNZ6 aoLg== Received: by 10.68.203.73 with SMTP id ko9mr7859360pbc.66.1341327318506; Tue, 03 Jul 2012 07:55:18 -0700 (PDT) Received: from [10.0.0.63] (50-78-194-198-static.hfc.comcastbusiness.net. [50.78.194.198]) by mx.google.com with ESMTPS id ns5sm15716720pbb.26.2012.07.03.07.55.14 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 03 Jul 2012 07:55:18 -0700 (PDT) Sender: Warner Losh Mime-Version: 1.0 (Apple Message framework v1084) Content-Type: text/plain; charset=us-ascii From: Warner Losh In-Reply-To: <86mx3gdhlk.wl%gnn@neville-neil.com> Date: Tue, 3 Jul 2012 08:55:11 -0600 Content-Transfer-Encoding: quoted-printable Message-Id: References: <1340992732.19144.YahooMailClassic@web113501.mail.gq1.yahoo.com> <4FF11659.8060405@FreeBSD.org> <20120702210931.GB85618@dragon.NUXI.org> <86mx3gdhlk.wl%gnn@neville-neil.com> To: gnn@freebsd.org X-Mailer: Apple Mail (2.1084) X-Gm-Message-State: ALoCoQlSF7mx8o5ZhcAdXq9lN3JR+KNBIIpAxA9xIOcfVzvKnZaM/W/ymWTdqfkl2PbIggAxu1cS Cc: Doug Barton , arch@freebsd.org, pfg@FreeBSD.org, David O'Brien 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: 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, 03 Jul 2012 14:55:19 -0000 On Jul 3, 2012, at 8:50 AM, gnn@freebsd.org wrote: > Again, moving to arch@ >=20 > At Mon, 2 Jul 2012 14:09:31 -0700, > David O'Brien wrote: >>=20 >> 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 >>>=20 >>> Creating a new vendor area would be the right solution, yes. >>=20 >> I totally disagree -- it will cause a real pain merging. >>=20 >> 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? >>=20 >> I don't believe 'svn merge -c ' will work because we already = have a >> different uts/common/fs/zfs/*.c from ^/vendor-sys/opensolaris. >>=20 >> I think we either need to just call Illumos OpenSolaris for these >> purposes, or 'svn move opensolaris illumos'. >>=20 >> I think this needs to be discussed with the Repo Meisters. >=20 > I actually agree with Doug here, but not strongly, I'd prefer to be > better educated about this topic. Do our Repo Meisters read arch@? I agree with Doug as well. I think that transitioning from one vendor = tree to the other is the right thing to do. Unless we have good, = concrete reasons not to do this, I think the default assumption should = be this is a good idea. I believe that svn merge -c XXX will work because of how mergenotes = work, but I'd appreciate confirmation from our repo masters. I think that having the two different sources is a good thing, should = OpenSolaris ever come back to live and be a viable source of imports. = We need to keep that option open, unless doing so has a real, = demonstrable harm. Warner=