Date: Wed, 6 Mar 2024 10:12:19 -0800 From: Warner Losh <imp@bsdimp.com> To: Gleb Smirnoff <glebius@freebsd.org> Cc: "Bjoern A. Zeeb" <bz@freebsd.org>, freebsd-git@freebsd.org Subject: Re: vendor imports beyond the committers guide? Message-ID: <CANCZdfqxF-oQvc_W1jMKs=F5SE13_NmtvFOnPetr5JH6fBcPaA@mail.gmail.com> In-Reply-To: <Zeig9nKD-Onc58T1@cell.glebi.us> 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>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] 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... Warner [-- Attachment #2 --] <div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, Mar 6, 2024 at 8:59 AM Gleb Smirnoff <<a href="mailto:glebius@freebsd.org">glebius@freebsd.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> Bjoern,<br> <br> On Wed, Mar 06, 2024 at 12:37:07AM +0000, Bjoern A. Zeeb wrote:<br> B> > These details likely need to be documented, but what's the details here that<br> B> > you need to do?<br> B> <br> B> I may want to track the (unchanged) versions of the LinuxKPI based wifi drivers<br> B> in sys/contrib/dev so we can more easily diff against the latest upstream<br> B> import and ship changes back etc.<br> <br> Can you please give an example, e.g. this the the directory in our tree and<br> this is the origin we want to make the vendor import from. I will experiment<br> and produce a sequence of git commands you'd need to do to make proper<br> subtree import. Warner will check me :)<br></blockquote><div><br></div><div>He wants to do this with the Linux drivers we have in the tree...</div><div><br></div><div>So we should get the version he started with, import that into the vendor</div><div>branch (for each driver, since they are separately released and versioned).</div><div>Once we do that, we can do a subtree merge, but we may have to jump through</div><div>some hoops so we wind up back to the current files. I have ideas how to do</div><div>this, but haven't done it yet. Once we have those, we can switch to updating</div><div>them via the standard vendor import stuff....</div><div><br></div><div>So I know I skipped an email in this change... if you, Bjorn, have the files / pointers</div><div>or whatever that you started with, I can import those, do the merge, then we can look</div><div>at updating. I'm hoping the number of changes are relatively small...</div><div><br></div><div>Warner </div></div></div>help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfqxF-oQvc_W1jMKs=F5SE13_NmtvFOnPetr5JH6fBcPaA>