Re: vendor imports beyond the committers guide?

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?

/bz

-- 
Bjoern A. Zeeb                                                     r15:7