[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20201029093017.01e7b1a2@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com>
Date: Thu, 29 Oct 2020 09:30:17 -0700
From: Jakub Kicinski <kuba@...nel.org>
To: Arnd Bergmann <arnd@...nel.org>
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Jonathan Corbet <corbet@....net>,
"David S. Miller" <davem@...emloft.net>,
driverdevel <devel@...verdev.osuosl.org>,
Arnd Bergmann <arnd@...db.de>,
"open list:DOCUMENTATION" <linux-doc@...r.kernel.org>,
Networking <netdev@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
Inaky Perez-Gonzalez <inaky.perez-gonzalez@...el.com>,
Johannes Berg <johannes@...solutions.net>
Subject: Re: [RFC] wimax: move out to staging
On Thu, 29 Oct 2020 17:26:09 +0100 Arnd Bergmann wrote:
> n Thu, Oct 29, 2020 at 4:56 PM Jakub Kicinski <kuba@...nel.org> wrote:
> > On Wed, 28 Oct 2020 06:56:28 +0100 Greg Kroah-Hartman wrote:
> > > On Tue, Oct 27, 2020 at 10:20:13PM +0100, Arnd Bergmann wrote:
> > >
> > > Is this ok for me to take through the staging tree? If so, I need an
> > > ack from the networking maintainers.
> > >
> > > If not, feel free to send it through the networking tree and add:
> > >
> > > Acked-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
> >
> > Thinking about it now - we want this applied to -next, correct?
> > In that case it may be better if we take it. The code is pretty dead
> > but syzbot and the trivial fix crowd don't know it, so I may slip,
> > apply something and we'll have a conflict.
>
> I think git will deal with a merge between branches containing
> the move vs fix, so it should work either way.
>
> A downside of having the move in net-next would be that
> you'd get trivial fixes send to Greg, but him being unable to
> apply them to his tree because the code is elsewhere.
>
> If you think it helps, I could prepare a pull request with this one
> patch (and probably the bugfix I sent first that triggered it), and
> then you can both merge the branch into net-next as well
> as staging-next.
If you wouldn't mind branch sounds like the best solution.
Acked-by: Jakub Kicinski <kuba@...nel.org>
Powered by blists - more mailing lists