On Wed, 2 Dec 2020 19:33:19 -0800 Sukadev Bhattiprolu wrote: > Jakub Kicinski [[email protected]] wrote: > > On Mon, 23 Nov 2020 20:34:07 -0800 Sukadev Bhattiprolu wrote: > > > We sometimes run into situations where a soft/hard reset of the adapter > > > takes a long time or fails to complete. Having additional messages that > > > include important adapter state info will hopefully help understand what > > > is happening, reduce the guess work and minimize requests to reproduce > > > problems with debug patches. > > > > > > Signed-off-by: Sukadev Bhattiprolu <[email protected]> > > > --- > > > > > > Changelog[v2] > > > [Jakub Kacinski] Change an netdev_err() to netdev_info()? Changed > > > to netdev_dbg() instead. Also sending to net rather than net-next. > > > > > > Note: this debug patch is based on following bug fixes and a feature > > > from Dany Madden and Lijun Pan: > > > > In which case you need to wait for these prerequisites to be in net-next > > and then repost. > > Jakub, > > A process question that I could not find an answer to on the netdev FAQ. > > With commit 98c41f04a67a ("ibmvnic: reduce wait for completion time") > the pre-requisites for the above patch are in the net tree but not yet > in net-next. > > When net-next is open, does it get periodically rebased to net tree or > does the rebase happen only when net-next closes?
net is merged into net-next after each PR with fixes we send to Linus, so they are merged periodically. There is no schedule for it but I usually send a PR on Thu and merge things late in the day on Thu or early Fri PST. > If latter, should I resend above patch based on net-next and handle a > manual merge during the rebase? (There is no functional dependence on > the pre-reqs - just needs a manual merge).
