From owner-freebsd-git@freebsd.org Fri Apr 23 21:26:34 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 F17A45FFC23 for ; Fri, 23 Apr 2021 21:26:34 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qk1-x72e.google.com (mail-qk1-x72e.google.com [IPv6:2607:f8b0:4864:20::72e]) (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 4FRnRG2FqQz3MCy for ; Fri, 23 Apr 2021 21:26:33 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: by mail-qk1-x72e.google.com with SMTP id d19so15347873qkk.12 for ; Fri, 23 Apr 2021 14:26:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:subject:message-id:mime-version :content-disposition; bh=loqVHInB8/G/aqPzn1c8w02KCmcU527+psxX+UEFtJ0=; b=NWHvoj1yo3DazZHIotAe9ZFAmUYDBYn/WhLcPxj6pEx7NoAfAbDDwukAAwCPhw9kgE lZlgSv95H+jn5UuomzsUcJKN7R+67+yHbq5Ymw42HqhEkwQubBqgJjmPB01j47opDMCm 77c0vBJQp0dW+7xwnVZGmOgDO/kD7FTZfcp5Gr/oh9/opDQDBND8FeS/g6LE5cwuMRZe 6ygKtznNXGUJZfTLinAJKoFTXmHpl1RjAMbIXIu/dD6UQ/exp3VKY6BwXWRsNfqx+8XS pNjLhVcGdSfN04IuBwmYVyF3JF2EnpaIEL1WgdNRLHUJrpQBZ23k0r5SRj8gVl2gA+pI clGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:subject:message-id :mime-version:content-disposition; bh=loqVHInB8/G/aqPzn1c8w02KCmcU527+psxX+UEFtJ0=; b=OE3B1Y9ouMMvXSEFEfb5WFPbynRHX6v1H1iR+qggTh18YhQKbXt6QvCfuOC8L/OwzH Qleag04IZbwcxvmWP+V6PTYrkdcJhus0YhRk4Id32HQiTu+MPftCITcwIq1JkhzFFle1 2IzEcDI/gQfjYU+NDvgaUp2fx1HXqGr6igF5PDgE7ljtCAmNEbOzjAX8kjabmwt9Q1Xb syX3Fy4etYsM/YwxYiI9j0FHoOpXqAgT1+JB8H8WVyMDdl8k9diYtdRg+wAaiEJaRYcu 3/hl+AKzE7wtYku8dJt5VNdUueCe228SvAld7mkp4Mbubf99sMnmJpPWVkdjFF2qwysa X2/A== X-Gm-Message-State: AOAM531J0ADl5p69999RIfZd1GHUR9I1BYmi5q0/uMnhtG/Xnlp4KaAm K0eNThJYhY6Hftewv32CBezLXQEUr+kgNw== X-Google-Smtp-Source: ABdhPJxM+9093SVqKx+v2nBmPFE+auzlaDDfrfylr/e7Hqp16rpRxfUJQDyuTdFEwxVCdeoevzPc/Q== X-Received: by 2002:ae9:f310:: with SMTP id p16mr6169013qkg.123.1619213192917; Fri, 23 Apr 2021 14:26:32 -0700 (PDT) Received: from nuc ([142.126.164.150]) by smtp.gmail.com with ESMTPSA id c15sm5481483qtg.31.2021.04.23.14.26.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Apr 2021 14:26:32 -0700 (PDT) Sender: Mark Johnston Date: Fri, 23 Apr 2021 17:26:33 -0400 From: Mark Johnston To: freebsd-git@freebsd.org Subject: vendor/illumos merges Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Rspamd-Queue-Id: 4FRnRG2FqQz3MCy X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=NWHvoj1y; dmarc=none; spf=pass (mx1.freebsd.org: domain of markjdb@gmail.com designates 2607:f8b0:4864:20::72e as permitted sender) smtp.mailfrom=markjdb@gmail.com X-Spamd-Result: default: False [-2.70 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FORGED_SENDER(0.30)[markj@freebsd.org,markjdb@gmail.com]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::72e:from]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[markj@freebsd.org,markjdb@gmail.com]; TO_DOM_EQ_FROM_DOM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::72e:from:127.0.2.255]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::72e:from]; MID_RHS_NOT_FQDN(0.50)[]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git] 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: Fri, 23 Apr 2021 21:26:35 -0000 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? 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 .