Date: Wed, 6 Mar 2024 19:44:33 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@freebsd.org> To: Warner Losh <imp@bsdimp.com> Cc: freebsd-git@freebsd.org Subject: Re: vendor imports beyond the committers guide? Message-ID: <q31p1656-6r83-0099-495p-7or9377s4131@serrofq.bet> In-Reply-To: <CANCZdfpyDQPcm2O6tzF4M91u7Pw_XhA5ihpCMON8=w7-YLezpw@mail.gmail.com> References: <n4p4714r-2n97-psq3-34p2-887qq0o1354q@SerrOFQ.bet> <CANCZdfpDDx=riEdExdpzmr6DHy7%2Bgpifm_1aJMcmGiSYAeVrgw@mail.gmail.com> <5pps4nrs-or51-9018-sqp4-7q69s4780r61@serrofq.bet> <Zeig9nKD-Onc58T1@cell.glebi.us> <CANCZdfqxF-oQvc_W1jMKs=F5SE13_NmtvFOnPetr5JH6fBcPaA@mail.gmail.com> <nr98n9r4-58r6-rn91-1p01-58q56260rn66@serrofq.bet> <CANCZdfpyDQPcm2O6tzF4M91u7Pw_XhA5ihpCMON8=w7-YLezpw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This message is in MIME format. The first part should be readable text,
while the remaining parts are likely unreadable without MIME-aware tools.
--1098556516-1002525340-1709754273=:2366
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8BIT
On Wed, 6 Mar 2024, Warner Losh wrote:
> On Wed, Mar 6, 2024 at 10:19 AM Bjoern A. Zeeb <bz@freebsd.org> wrote:
>
>> On Wed, 6 Mar 2024, Warner Losh wrote:
>>
>>> On Wed, Mar 6, 2024 at 8:59 AM Gleb Smirnoff <glebius@freebsd.org>
>> 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
>> 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 tree
>> 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 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
>> 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, then
>>> 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?
- iwlwifi I think it is 5 full versions (and 3 or 4 "remote cherry picks" in
between in case it matters)
- rtw88 probably 3 versions
- the others {rtw89, ath10k, ath11k, ath12k, mt76} I think it was only 2 each.
--
Bjoern A. Zeeb r15:7
--1098556516-1002525340-1709754273=:2366--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?q31p1656-6r83-0099-495p-7or9377s4131>