On Tue, 15 Dec 2020 02:30:08 -0600 Lijun Pan wrote: > Commit b27507bb59ed ("net/ibmvnic: unlock rtnl_lock in reset so > linkwatch_event can run") introduced do_change_param_reset function to > solve the rtnl lock issue. Majority of the code in do_change_param_reset > duplicates do_reset. Also, we can handle the rtnl lock issue in do_reset > itself. Hence merge do_change_param_reset back into do_reset to clean up > the code. > > Signed-off-by: Lijun Pan <l...@linux.ibm.com> > --- > This patch was accepted into net-next as 16b5f5ce351f but was reverted > in 9f32c27eb4fc to yield to other under-testing patches. Since those > bug fix patches are already accepted, resubmit this one.
The merge window has started now, and we're merging net into net-next pretty much every week, so this could have been done sooner. Let's wait for net-next to reopen.