On Thu, 15 Oct 2020 15:37:00 -0700 Jakub Kicinski wrote:
> On Thu, 15 Oct 2020 15:24:51 -0700 Jakub Kicinski wrote:
> > On Fri, 16 Oct 2020 08:59:22 +1100 Stephen Rothwell wrote:
> > > > I will apply the above patch to the merge of the usb tree today to fix
> > > > up a semantic conflict between the usb tree and Linus' tree.
> > >
> > > It looks like you forgot to mention this one to Linus :-(
> > >
> > > It should probably say:
> > >
> > > Fixes: b2a0f274e3f7 ("net: rtl8150: Use the new usb control message API.")
> >
> > Umpf. I think Greg sent his changes first, so this is on me.
> >
> > The networking PR is still outstanding, can we reply to the PR with
> > the merge guidance. Or is it too late?
>
> I take that back, this came through net, not net-next so our current
> PR is irrelevant :)
Looks like the best thing to do right now is to put this fix in net,
so let me do just that (with the Fixes tag from Stephen).
Thanks Anant!
