From owner-freebsd-git@freebsd.org Sat Apr 24 10:44:42 2021 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0FDC05FADBE for ; Sat, 24 Apr 2021 10:44:42 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FS7894jKfz4nPm; Sat, 24 Apr 2021 10:44:41 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: uqs/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4586528841; Sat, 24 Apr 2021 10:44:41 +0000 (UTC) (envelope-from uqs@freebsd.org) Date: Sat, 24 Apr 2021 12:44:40 +0200 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Mark Johnston Cc: freebsd-git@freebsd.org Subject: Re: vendor/illumos merges Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: User-Agent: Mutt/2.0.3 (2020-12-04) X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Apr 2021 10:44:42 -0000 On Fri, 2021-04-23 at 17:26:33 -0400, Mark Johnston wrote: >Hi, > >Now that FreeBSD uses OpenZFS as the upstream for ZFS, vendor/illumos is >mostly unused. However, we still use illumos as an upstream for CTF >tools and DTrace, though there haven't been any imports in a while. > >illumos has put a lot of work into their CTF toolchain, and I'd like to >import that. There are a couple of snags that I'd appreciate some >guidance on. > >First, I believe I should delete now-unused ZFS code from the vendor >branch and merge the result to main. I did this locally and got an >empty merge, which is what I'd expect. Is there any problem with this? Why would you record this empty merge? If you clean up vendor/foo, just do that but don't merge a no-op back into main (nothing changed, after all). >Second, with Subversion we had both vendor/illumos and >vendor-sys/illumos, and now we just have the former, seemingly with >sys/* bits imported from vendor-sys. Some of the upstream commits touch >both userspace and kernel bits, but the merge targets for these in >FreeBSD are different: cddl/contrib/opensolaris vs. >sys/cddl/contrib/opensolaris. How should I merge into main in this >case? I don't really see any options other than to split each offending >upstream commit into two parts, one for userspace and one for the >kernel, and merge them separately. > >If it helps to look at the branch where I staged the upstream commits, >I've pushed it to vendor/illumos2 in https://github.com/markjdb/freebsd >. Can you clarify why the merging of the two might be an issue? Note that unlike subversion, in git there's no "merge a certain subtree" handling, all that is recorded is a tree of some form and then a set of parents or ancestor commits. (git is a content tracker, not really a VCS :) I was under the impression that userland and kernel imports/merges need to happen at the same time anyway, so I assume you would import all the bits under vendor/foo in 1 commit and then merge them in 1 commit into main. Is that not how it goes? Cheers Uli