Date: Wed, 6 Mar 2024 11:26:00 -0800 From: Warner Losh <imp@bsdimp.com> To: "Bjoern A. Zeeb" <bz@freebsd.org> Cc: freebsd-git@freebsd.org Subject: Re: vendor imports beyond the committers guide? Message-ID: <CANCZdfpyDQPcm2O6tzF4M91u7Pw_XhA5ihpCMON8=w7-YLezpw@mail.gmail.com> In-Reply-To: <nr98n9r4-58r6-rn91-1p01-58q56260rn66@serrofq.bet> 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>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] 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? 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 10:19 AM Bjoern A. Zeeb <<a href="mailto:bz@freebsd.org">bz@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">On Wed, 6 Mar 2024, Warner Losh wrote:<br> <br> > On Wed, Mar 6, 2024 at 8:59 AM Gleb Smirnoff <<a href="mailto:glebius@freebsd.org" target="_blank">glebius@freebsd.org</a>> wrote:<br> ><br> >> 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<br> >> 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<br> >> drivers<br> >> B> in sys/contrib/dev so we can more easily diff against the latest<br> >> 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<br> >> 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> >><br> ><br> > He wants to do this with the Linux drivers we have in the tree...<br> ><br> > So we should get the version he started with, import that into the vendor<br> > branch (for each driver, since they are separately released and versioned).<br> > Once we do that, we can do a subtree merge, but we may have to jump through<br> > some hoops so we wind up back to the current files. I have ideas how to do<br> > this, but haven't done it yet. Once we have those, we can switch to updating<br> > them via the standard vendor import stuff....<br> ><br> > So I know I skipped an email in this change... if you, Bjorn, have the<br> > files / pointers<br> > or whatever that you started with, I can import those, do the merge, then<br> > we can look<br> > at updating. I'm hoping the number of changes are relatively small...<br> <br> I can probably produce (for each driver) a set of the original<br> unmodified files which then went into FreeBSD with modifications<br> if we do need the entire history and not just the set from the latest<br> import?<br></blockquote><div><br></div><div>How many versions are there?</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?CANCZdfpyDQPcm2O6tzF4M91u7Pw_XhA5ihpCMON8=w7-YLezpw>