From owner-freebsd-git@freebsd.org Mon Apr 26 15:40:16 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 5B4DE5E56DD for ; Mon, 26 Apr 2021 15:40:16 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qv1-xf29.google.com (mail-qv1-xf29.google.com [IPv6:2607:f8b0:4864:20::f29]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FTTcJ0j1Gz3mK6 for ; Mon, 26 Apr 2021 15:40:16 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qv1-xf29.google.com with SMTP id j3so27414351qvs.1 for ; Mon, 26 Apr 2021 08:40:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=QtRGyZbw1ISQtF4A06zS/Li0y6xg42QfyIfKd0jZ6po=; b=zzRDb7hwY8/1ozIl1i+A7Il7U5dBxOrdQhJ/7QcQEgEKQ/0bD5GPNlOXLhGlu3eNjJ 4zjHKMmiLMJVDfcbPsbDtVwjhbZsScsY5oi/X17RwO2cw/d0ElYDi8jbZKy7ij2RH8sW Hy0FWWUZeXX8K8mcvQO5PlcQFyye+ozcVL/n09mCoAj0jenpdpP1pQxwicuC/rHTlrmN oSFt/WJH1+S0xmn/NnDTJlR1N+imlq5tJDmIbnS0GIAXAGSuWSO1gRiHYC+0xW0hz49M PLt8g7KYIM0UVYujB9d+i3+IznFlWgMFGZOClVpNhrodh0utgNP1JL72+YIcASTSedYk Kj3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=QtRGyZbw1ISQtF4A06zS/Li0y6xg42QfyIfKd0jZ6po=; b=G4IKm4z34bFEzidmfV4DE1HU2zH+LW0l2lx3PdRjMAatax4zIzm+AyPLJS6G41AW10 0X63OoagJHWJMRq+rs5AJizoEgdhAD86CnpGc5facEulTffH8off35yDVhoU6QG93KD6 oMGsBJ0HxWdxhfs6TWvHgH7bULhInNvRDl/XN3TCRTmtg+0MIoU/ysFNtvP2+f4lY0ES 4IahagR0rtxlpfaKI+9v4foL/ZUUmnjTXQjxz8q/qAduzLS4Ln5btdVo+211RnhjUEg9 KuqFXynswN/LGT95QqwQPjJLbHUdkfESDe9LYuB+G5lTEQdfYcW+K5kSV3ssCICGoK10 EC+Q== X-Gm-Message-State: AOAM532ZPhcGZtI+I2P5CoAv0FEanspRWOz402NnJ29bFuyc7TdRBPZE 88kHqOWuBOwUQpUrOkI9zsAdYQLM8Lf4FlSdy/VjJQ== X-Google-Smtp-Source: ABdhPJxuMJkitpOeTZTNnMpEHEVw5/DhbIfHUD+GG5znZBUJ+z1+3Rj9srcEFVRmYtE06bUOikAifa1N2JkoU1Js2cc= X-Received: by 2002:a05:6214:1866:: with SMTP id eh6mr18552266qvb.29.1619451614971; Mon, 26 Apr 2021 08:40:14 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Mon, 26 Apr 2021 09:40:03 -0600 Message-ID: Subject: Re: vendor/illumos merges To: Kyle Evans Cc: Mark Johnston , freebsd-git X-Rspamd-Queue-Id: 4FTTcJ0j1Gz3mK6 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.34 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: Mon, 26 Apr 2021 15:40:16 -0000 On Mon, Apr 26, 2021 at 6:52 AM Kyle Evans wrote: > On Sat, Apr 24, 2021 at 10:09 AM Mark Johnston wrote: > > > > On Sat, Apr 24, 2021 at 12:44:40PM +0200, Ulrich Sp=C3=B6rlein wrote: > > > On Fri, 2021-04-23 at 17:26:33 -0400, Mark Johnston wrote: > > [... snip ...] > > > >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 commit= s, > > > >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 th= at > > > 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 ne= ed > > > to happen at the same time anyway, so I assume you would import all t= he > > > bits under vendor/foo in 1 commit and then merge them in 1 commit int= o > > > main. Is that not how it goes? > > > > How can I do that with git subtree merge? Suppose an illumos commit > > modifies cmd/dtrace/foo.c (userspace) and uts/common/dtrace/foo.c > > (kernel). That maps to cddl/contrib/opensolaris/cmd/dtrace/foo.c and > > sys/cddl/contrib/opensolaris/uts/common/dtrace/foo.c in FreeBSD, > > respectively. So to do a subtree merge, I need to use distinct prefixe= s > > depending on whether I'm importing userspace or kernel changes. When > > they are mixed together, it's not clear to me how I can merge at all. > > > > I see that for OpenZFS we keep all code, including userspace code, unde= r > > sys/contrib/openzfs, so it doesn't have this problem. > > There's some level of precedence for userland build reaching into sys/ > outside of OpenZFS, so if it makes life easier I would totally just > blow away the existing structure to have a vendor/illumos that matches > upstream structure and merge it all into sys/cddl. > libcam has been doing it since around FreeBSD 3 or so... Warner