From nobody Wed Mar 6 19:26:00 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 4Tqj8j5T5Zz5D8s1 for ; Wed, 6 Mar 2024 19:26:13 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) (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 4Tqj8j1fcMz46Y9 for ; Wed, 6 Mar 2024 19:26:13 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-a458eb7db13so12463466b.2 for ; Wed, 06 Mar 2024 11:26:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1709753172; x=1710357972; 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=U2GqVBp0eMNYKaFkA/8KtXoqHBJ4l2ZIrTDp6DqseUI=; b=iPhFzylUjLFVgqYva+xpSopNa+OBnfZGXmimTXW5SnHSxSoKsgcbf+iess40dmk8iw IQ4wawH3hR5hpSAGtFqpddSTCoyoKgOGlFTX8rEGNRm5EtDSH3I0QzCY3s1nHYMzP9+a 6RILLT6b5tuP4LzGtV+2KDL9ksdAfE87nGBxkXMhPzItVBp36U33m5mBl4Rvbb2/LW6Z CBQxYuwq4SV/BiuBWYWXa3B/rtVyFmEd4aJNlcank/RfDTrIO/kPW51rgZWDL0+Gh+Lr gCl/Udc6cjcXYVARfRVZXrmIkI109YQUBEjjW02cz18TvhTbkCk4A0kluOpFcBC9v9nj xxxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709753172; x=1710357972; 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=U2GqVBp0eMNYKaFkA/8KtXoqHBJ4l2ZIrTDp6DqseUI=; b=kG/i8THi7YmfgB6RoBBc14ZbJoRn+3p02gKUFfR0zM/yZysXEoNvPst46m9E4IdY8d xbuSaWgvxEyuv+emr0diuFVY5dDIG5R6xrLA106DLVj4vXVJUrlDDv6lmSwnHWhKUY7i PnYStLMilZLf5i+Sfu7V2Q+8f7aXfns8f9hXaOry3kymLeHIOXnHLaIpz0KUVsm+h5Te UyhGJ2fUnEzzL/xhJXW/woyk0lhPyTZTwu+7halJFr0L3YWZ6CqGBEeVrvrPPBK4ppNg 66uVJ7MTO5d6/dQnBhRoyAz8Kcn7EaE/UInIDytoHwiCbP7f2rA5XcwrT2vFy8YE/6Ij YCVw== X-Gm-Message-State: AOJu0Ywo7Qo/v0niaCCyVTdLhCGJOdjTQj4Lqo0RxBDFFXVDHDWIgQ+e 8QjMnuDp8hWeKEjfpwfkSxQMav+cDkiu7+oP36uZPe4S9+8WxmwfOVL52DeHBoA6Wx36vaiEscl LjUbj0t5CAXU1o1BVnsR9KcXUM7aQff6rOCLWSUXpqdcIBdRdaNI= X-Google-Smtp-Source: AGHT+IHXeoTMqs2Ga5sC8Ny9xB0W+4WCLlylcsK0XbqDVffAk8pK32B/W4qojKu9fh2oAIu5En1OhNPN3OPcTDGobU4= X-Received: by 2002:a17:906:d92d:b0:a43:fa38:901d with SMTP id rn13-20020a170906d92d00b00a43fa38901dmr10851706ejb.45.1709753171495; Wed, 06 Mar 2024 11:26:11 -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 11:26:00 -0800 Message-ID: Subject: Re: vendor imports beyond the committers guide? To: "Bjoern A. Zeeb" Cc: freebsd-git@freebsd.org Content-Type: multipart/alternative; boundary="00000000000070ec06061302ee84" 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: 4Tqj8j1fcMz46Y9 --00000000000070ec06061302ee84 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Mar 6, 2024 at 10:19=E2=80=AFAM Bjoern A. Zeeb wro= te: > On Wed, 6 Mar 2024, Warner Losh wrote: > > > 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 detail= s > >> here that > >> B> > you need to do? > >> B> > >> B> I may want to track the (unchanged) versions of the LinuxKPI based > wifi > >> 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 tre= e > and > >> 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 vend= or > > 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 > updating > > 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, th= en > > we can look > > at updating. I'm hoping the number of changes are relatively small... > > I can probably produce (for each driver) a set of the original > unmodified files which then went into FreeBSD with modifications > if we do need the entire history and not just the set from the latest > import? > How many versions are there? Warner --00000000000070ec06061302ee84 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Wed, Mar 6, 2024 at 10:19=E2=80=AF= AM Bjoern A. Zeeb <bz@freebsd.org&= gt; wrote:
On We= d, 6 Mar 2024, Warner Losh wrote:

> On Wed, Mar 6, 2024 at 8:59=E2=80=AFAM Gleb Smirnoff <glebius@freebsd.org> wro= te:
>
>>=C2=A0 =C2=A0Bjoern,
>>
>> On Wed, Mar 06, 2024 at 12:37:07AM +0000, Bjoern A. Zeeb wrote: >> B> > These details likely need to be documented, but what= 9;s the details
>> here that
>> B> > you need to do?
>> B>
>> B> I may want to track the (unchanged) versions of the LinuxKPI= based wifi
>> drivers
>> B> in sys/contrib/dev so we can more easily diff against the la= test
>> upstream
>> 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
>> experiment
>> and produce a sequence of git commands you'd need to do to mak= e 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 ven= dor
> branch (for each driver, since they are separately released and versio= ned).
> Once we do that, we can do a subtree merge, but we may have to jump th= rough
> some hoops so we wind up back to the current files. I have ideas how t= o do
> this, but haven't done it yet. Once we have those, we can switch t= o updating
> 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, t= hen
> we can look
> at updating. I'm hoping the number of changes are relatively small= ...

I can probably produce (for each driver) a set of the original
unmodified files which then went into FreeBSD with modifications
if we do need the entire history and not just the set from the latest
import?

How many versions are there?

Warner=C2=A0
--00000000000070ec06061302ee84--