From nobody Thu Mar 07 18:07:52 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 4TrHN46Ny0z5DXg8 for ; Thu, 7 Mar 2024 18:08:04 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) (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 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TrHN44MV7z4R6W for ; Thu, 7 Mar 2024 18:08:04 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-a450bedffdfso171293766b.3 for ; Thu, 07 Mar 2024 10:08:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1709834883; x=1710439683; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=EsUoL+PKoRodbhcZtMQotPgvT5qiLehcmxSZX76pVi0=; b=h+f9Aflu2Wz0hw85xcDl5JYH3wq0zpZopvjnL4c78mHkEJGSZ3Tdjmpg0aRcLZYlz8 EDscMOIWEgDaFY6J179W/y3rQkwshMR0ZR7UGYxfUZ+noxvfR4JEUMAycPyKP8yiGMTS PCFBTV1MKwE0nTJ0UIJm1AXNUYrS7RdV6pzqGS4LLRjcM12UTY9FVgZdYZiiAIbAP4ZL pv7pf+TCAfYA8H+0B82DNK0NvsD9ncKUi7yBGRqxs5j3klDc9358/jznQF4M89Fc1Bmx vdJEGSAZ1lwuBKgilaUfOMo5g8f+jJzQdIbj/tghJdRcsavRa8N3zXyPrN5wePtKAfGj 7PwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709834883; x=1710439683; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=EsUoL+PKoRodbhcZtMQotPgvT5qiLehcmxSZX76pVi0=; b=G6WonCdZaBwEKJjettYA0MEwsUqvxSyeIuo6l/1PJV48DMx5wZ45O/RuLuFPmcPxp6 LAeKzB/dr8qGqyDYzYWWCSU5g10CbIYs7wuVyqBm7ymg4QkCE5gPobXXKSw/y61PRe4a oOkigFP50yIpm+CE2262+aJEc8EXdHciAUsSmjL3/nKO/H7SF/juxzC60fdsrnftd8nl BJywZIEEyxN0Y2WicCZ/cRr46DfjbZeRVu7PopTTiKhjAc1OCL36GlkLQNM4NmD+BUME C38NmDzHxo5nVbMWvUxAZ4HsPPNSEMgpvc9oCB8Fv2aOqiH3UYKy5wmJSUl6RNEOMO7P r/Ow== X-Forwarded-Encrypted: i=1; AJvYcCWLYHt9UHWAw5z9q5yUjp1VBT07yiX4MYbOIJcJQH288PqMO/0IsZf3B3Z2rOYBeQJaW/e8q6AM4tUOyVfkofplI599ktIGHQ== X-Gm-Message-State: AOJu0YzBXQBhkX/zAx8RARbZHAQd/IsAKb98VFA1/5MzCWgbhwv+rm63 5sFpkHAnHqbJSaBKQGx16E2ShAxO8M66Z6L30XJhm05/Qt5nLLjm8iLr/vdh1/8GBWlLGWmJGmX mpFdm8Av8ywmTkn3votyUpOv/+U0jVLHnmxLxpgE+GPSeYde7XBA= X-Google-Smtp-Source: AGHT+IHMwnfRhUYnE2EJkDfahsn3IA2T7zJttshCFVzskG/5uj5ty/1Sb9eSIQEA4ANQ/ZQTe/0utV8wT6OF08Jo3vY= X-Received: by 2002:a17:906:5585:b0:a45:25d:a291 with SMTP id y5-20020a170906558500b00a45025da291mr9699397ejp.25.1709834882874; Thu, 07 Mar 2024 10:08:02 -0800 (PST) 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 References: <5pps4nrs-or51-9018-sqp4-7q69s4780r61@serrofq.bet> <8n0r562s-non1-5269-p649-2s8rr05op914@serrofq.bet> In-Reply-To: <8n0r562s-non1-5269-p649-2s8rr05op914@serrofq.bet> From: Warner Losh Date: Thu, 7 Mar 2024 10:07:52 -0800 Message-ID: Subject: Re: vendor imports beyond the committers guide? To: "Bjoern A. Zeeb" Cc: Gleb Smirnoff , freebsd-git@freebsd.org Content-Type: multipart/alternative; boundary="000000000000d19a65061315f483" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4TrHN44MV7z4R6W --000000000000d19a65061315f483 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Mar 7, 2024 at 10:04=E2=80=AFAM Bjoern A. Zeeb wro= te: > 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 message= s > 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 th= e > > 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. > If it is from the Linux Kernel, then I'd just need a directory list and a hash. And we definitely can't do a subtree merge from that repo to ours including its entire history. > I'll go and prepare the different versions locally the next days for > each driver and then we can see. > I think I just need a list of hashes and directories. I can bring it into a test vendor branch I can push to my personal github so everyone can take a look before we do the merge and make it permanent. Warner --000000000000d19a65061315f483 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Thu, Mar 7, 2024 at 10:04=E2=80=AF= AM Bjoern A. Zeeb <bz@freebsd.org&= gt; wrote:
On Th= u, 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-pic= ks). in
> W> order and
> W> then merged, this would give us a better history. The commit mes= sages of
> W> the old
> W> versions could include the hash where it was committed to the tr= ee's main
> W> branch.
> W> This might be wise, since it would allow us to add these links i= n the
> W> future if that
> W> functionality is added to git (or someone cures me of my ignoran= ce). 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 b= est, so if
> W> there's
> W> more than a tiny amount of hassle, we should skip doing each ver= sion.
>
> Well, if the upstream is a true git repo, then we don't need to ca= re
> about versions, we can take it with full history as 'subtree add&#= 39;.
> 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 metadata= s.
>
> 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.=C2=A0 And I believe we do not do subtrees in FreeBSD official.

If it is from the = Linux Kernel, then I'd just need a directory list and a hash.

And we definitely can't do a subtree merge from that re= po to ours including
its entire history.=C2=A0
=C2=A0
I'll go and prepare the different versions locally the next days for each driver and then we can see.

I thin= k I just need a list of hashes and directories. I can bring it into a
=
test vendor branch I can push to my personal github so everyone can
take a look before we do the merge and make it permanent.

Warner
--000000000000d19a65061315f483--