From nobody Thu Mar 07 18:04:05 2024 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TrHHY64ktz5DXSK for ; Thu, 7 Mar 2024 18:04:09 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 4TrHHY5Sllz4QTl; Thu, 7 Mar 2024 18:04:09 +0000 (UTC) (envelope-from bz@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709834649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=nIOh1ktW8GnxGj439OWSukqsyj3hUOVDhD4riA1JQWA=; b=OiSfCYvUFlLtu4/QmgEfmMKah4l1N8cxCLrH116BzVgHCI6gxvlPzIxhsmxS0ToZAY+1n6 1PGzkMB4kx24lEfsmuuIe8qwNam67Vm9YV+1Y2k63VZZiF6wwIrhCdT0bLhGjp+8guMj0F tyro7CI3TQpAYbg1Io6Zn1ueIqFVwmu7SaVgb2+gCLnZnrypLQ0rfn276r1fPsMHGfxZxQ ijIuL85DBtSVhCYEhxNCznSZbH/ZX0ISreQJLPLWIajRbpcWR3pyeIt2gal3MNJ8BD6AnI BqddCdRmUWcD+tWzQdbVISAoC3VVNsRDa8PPhN2On0o+SRLDVMHDyrha9eJskQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709834649; a=rsa-sha256; cv=none; b=ms7ZJZ9+e7hhchSFHEjxzPt6TUG7W00tUXCdLED78GXPAGngMhP+St60TovXEnRlBfQX6b 6Dzsj1xiMFAKwL19C+Gle5KzxQdPx85D9jMjvXI5MYnSNbUL0q00cy/7S7rviQu471FP2c xeCy3/MbnV2iYUWEdjVP0PTKnuuMxRChC+irzIi81xCEog8pRNG0bpbXHcRH0YMGHPqJrv hJdY/i7sqH0djbMj7II4M/J0bOxD8Dxa54po1fbl4w94PuvSTKBEYWUlZc08+TdI+Rn/rE XTwMN/SgiUM3Ou4ABEUcjAuZ15+q/0bRRbl7sPfb9CkDFB2A3Q50cUOuxecOFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709834649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=nIOh1ktW8GnxGj439OWSukqsyj3hUOVDhD4riA1JQWA=; b=vQwEqUy7WnChVvybmzVImz9Vg7dqM5Vuv6yaTxF1XgczcsblM0DRcspcsVXJzYIvHjry58 j3fyzDAFA8JHLFvjib6yqrPYkc3xeMbK8XieqNRxU8b8yjfTegr+97NCeBEaUWwQ8GqgK2 mRFNtfGLoQ/NTRtBAR0PbgOINB0sjrvu0F6An49M1p9PPYF/8T20iYFVScLX/bwuwM1u+Q 301wg+1moSpxQDYkBE4d+tJPvhuBj9wOnAeTFjVFl4YgR4k85kSCixcoUUvroXrFQzLWKB iivX9nmwJtK3TgGfIWOhmmo1ji2k6VyICMVzjTkuyNkOyQ0/a8JmUNFHmSPkyA== Received: from mx1.sbone.de (mx1.sbone.de [IPv6:2a01:4f8:13b:39f::9f:25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE Root Certificate Authority" (not verified)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TrHHY3hJHz1BQS; Thu, 7 Mar 2024 18:04:09 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 3CFF28D4A214; Thu, 7 Mar 2024 18:04:08 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 6EB2C2D029D8; Thu, 7 Mar 2024 18:04:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id ZuQTfFWXVyNn; Thu, 7 Mar 2024 18:04:06 +0000 (UTC) Received: from strong-iwl0.sbone.de (strong-iwl0.sbone.de [IPv6:fde9:577b:c1a9:4902:b66b:fcff:fef3:e3d2]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 473FC2D029D2; Thu, 7 Mar 2024 18:04:06 +0000 (UTC) Date: Thu, 7 Mar 2024 18:04:05 +0000 (UTC) From: "Bjoern A. Zeeb" To: Gleb Smirnoff cc: Warner Losh , freebsd-git@freebsd.org Subject: Re: vendor imports beyond the committers guide? In-Reply-To: Message-ID: <8n0r562s-non1-5269-p649-2s8rr05op914@serrofq.bet> References: <5pps4nrs-or51-9018-sqp4-7q69s4780r61@serrofq.bet> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed On Thu, 7 Mar 2024, Gleb Smirnoff wrote: > On Wed, Mar 06, 2024 at 03:51:11PM -0800, Warner Losh wrote: > W> If we imported each of the versions (exclusive of the cherry-picks). in > W> order and > W> then merged, this would give us a better history. The commit messages of > W> the old > W> versions could include the hash where it was committed to the tree's main > W> branch. > W> This might be wise, since it would allow us to add these links in the > W> future if that > W> functionality is added to git (or someone cures me of my ignorance). I > W> think that > W> if these versions were trivial to get, we should do it. If they are a > W> hassle, then we > W> can forego them. The possible future benefit is speculative at best, so if > W> there's > W> more than a tiny amount of hassle, we should skip doing each version. > > Well, if the upstream is a true git repo, then we don't need to care > about versions, we can take it with full history as 'subtree add'. > Then, replay our commits on top. The downside is that each file will > have two histories, and it would require some effort when you call > git log to get the correct one. The repo bloat will not be large as > the objects would be the same, it would be only extra commits metadatas. > > This all will look like a small version of what we have at Netflix, > where we followed unofficial FreeBSD git repo and then switched to > the official one. In practice it seems to work well, although a > perfectionists would not like doubled commits deep in the past. > > Bjoern, can you please point me at upstream source of truth? > Is it a repo, or what is it. yes, it's three or four or five different repos with the full linux kernel in it; nothing you want. And I believe we do not do subtrees in FreeBSD official. I'll go and prepare the different versions locally the next days for each driver and then we can see. /bz -- Bjoern A. Zeeb r15:7