From nobody Wed Mar 6 18:12:19 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 4TqgWh5WCJz5D33F for ; Wed, 6 Mar 2024 18:12:32 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) (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 4TqgWh3dkbz3wx8 for ; Wed, 6 Mar 2024 18:12:32 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-a44e3176120so9338666b.1 for ; Wed, 06 Mar 2024 10:12:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1709748750; x=1710353550; 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=JoLBRKddTd837WasF5moLpBLHUEz2wvEfVKU63V1ZDM=; b=AGu9QIPxBtXQi1B0S95eH+KZoYkzYfoo/yHE3V5X45RTi9H6v9uTjOKasuxu89lhAH 9uPq3jUQwROSyd2TRI5k5h0XxEDOVUjFkD0cGw30D49hbg1wF75VJln7cSFQTPSYBB8o OBSg+x068FZhO3Bk+WrJDtWs3mh0LdxGCWpNruTcYOkbz/GunvpwqS48YBNxcqpXAA0t yNTJDBqQ1xChfEw3Cg+ozvq+FpEJRReXZSwfVH7qKN1pCC5jARg8StwNLX7gyYFTNLqH gbBNL8+f3CFQgLQsGmpN6Kif90Sku2d/IGRUH1nIbiMcDidHY4LkrV/we/1XRlF/lSqb i32A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709748750; x=1710353550; 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=JoLBRKddTd837WasF5moLpBLHUEz2wvEfVKU63V1ZDM=; b=QdkH+lwKGsFcJ3osSB+odK1FJA+2gGUEmzkcV04UVNHrcKGgcbafdx+6d+DtOzURUZ iUakk5FRyesy4fdM8gEeWfyacdzbhHyR9IISPbPQNR//goyR8XM+OM3b56C67F3DhXTT yhvOwq5o896wC+WONcI66dS5sssNUbuGOVV0peiwBWQVNotM+sG4ZxLyX0gO9T3qNCuY aQgfZgYuheUvVNC2XMbBz0VGWAk4ZZCCooi0oGuqAVbFqINW6X5SRlgT/ZYkVLOvXzk4 zXwFdAmjFQ6SmmVzabEB0JIH3WK8S7SQ34pTo+ZAILjdH3mrW/FmvD6DQWlIuPLebCJf MgvQ== X-Forwarded-Encrypted: i=1; AJvYcCWqfmcj7jquoWVIH04S6YDxP/Yfa2aef0m5gs3uxShnMrn7TsbfXVLiRVB612zyAhiZIWuuC9fmTUr6pV2LRK/ofi01CBhDOA== X-Gm-Message-State: AOJu0YxZWjtcn1bZbz/8z118F2YkEOB3CelpT/RpfT0Vyx6THnhqOtkN KqDMPKYh6dq0Hki6t4RTGnA1tEZt6PzBW3GCWWTURFOqqxGT1BUZLGWUtD57ro53GUYzZ/GIAKL x8NxXP56knGQHKsYVKlSTQoL1mqkr582KbZLj+Q== X-Google-Smtp-Source: AGHT+IF5v0zJj/cRT0Ij4yo0o4MIz66isXJA/G86mCXuetYP0T16V45RZNGVv28SKA99jCm7YXkALPzHjBlqOEMJzlw= X-Received: by 2002:a17:906:aa0e:b0:a45:4ba5:2917 with SMTP id ko14-20020a170906aa0e00b00a454ba52917mr6351693ejb.75.1709748750206; Wed, 06 Mar 2024 10:12:30 -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> In-Reply-To: From: Warner Losh Date: Wed, 6 Mar 2024 10:12:19 -0800 Message-ID: Subject: Re: vendor imports beyond the committers guide? To: Gleb Smirnoff Cc: "Bjoern A. Zeeb" , freebsd-git@freebsd.org Content-Type: multipart/alternative; boundary="000000000000e96291061301e61c" 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: 4TqgWh3dkbz3wx8 --000000000000e96291061301e61c Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Mar 6, 2024 at 8:59=E2=80=AFAM Gleb Smirnoff = wrote: > Bjoern, > > On Wed, Mar 06, 2024 at 12:37:07AM +0000, Bjoern A. Zeeb wrote: > B> > These details likely need to be documented, but what's the details > here that > B> > you need to do? > B> > B> I may want to track the (unchanged) versions of the LinuxKPI based wif= i > drivers > B> in sys/contrib/dev so we can more easily diff against the latest > upstream > B> import and ship changes back etc. > > Can you please give an example, e.g. this the the directory in our tree a= nd > this is the origin we want to make the vendor import from. I will > experiment > and produce a sequence of git commands you'd need to do to make proper > subtree import. Warner will check me :) > He wants to do this with the Linux drivers we have in the tree... So we should get the version he started with, import that into the vendor branch (for each driver, since they are separately released and versioned). Once we do that, we can do a subtree merge, but we may have to jump through some hoops so we wind up back to the current files. I have ideas how to do this, but haven't done it yet. Once we have those, we can switch to updatin= g them via the standard vendor import stuff.... So I know I skipped an email in this change... if you, Bjorn, have the files / pointers or whatever that you started with, I can import those, do the merge, then we can look at updating. I'm hoping the number of changes are relatively small... Warner --000000000000e96291061301e61c Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Wed, Mar 6, 2024 at 8:59=E2=80=AFA= M Gleb Smirnoff <glebius@freebsd.= org> wrote:
=C2=A0 Bjoern,

On Wed, Mar 06, 2024 at 12:37:07AM +0000, Bjoern A. Zeeb wrote:
B> > These details likely need to be documented, but what's the d= etails here that
B> > you need to do?
B>
B> I may want to track the (unchanged) versions of the LinuxKPI based wi= fi drivers
B> in sys/contrib/dev so we can more easily diff against the latest upst= ream
B> import and ship changes back etc.

Can you please give an example, e.g. this the the directory in our tree and=
this is the origin we want to make the vendor import from.=C2=A0 I will exp= eriment
and produce a sequence of git commands you'd need to do to make proper<= br> subtree import. Warner will check me :)

He wants to do this with the Linux drivers we have in the tree...

So we should get the version he started with, import that = into the vendor
branch (for each driver, since they are separatel= y released and versioned).
Once we do that, we can do a subtree m= erge, but we may have to jump through
some hoops so we wind up ba= ck to the current files. I have ideas how to do
this, but haven&#= 39;t done it yet. Once we have those, we can switch to updating
t= hem via the standard vendor import stuff....

So I = know I skipped an email in this change... if you, Bjorn, have the files / p= ointers
or whatever that you started with, I can import those, do= the merge, then we can look
at updating. I'm hoping the numb= er of changes are relatively small...

Warner=C2=A0=
--000000000000e96291061301e61c--