On Tue, 2023-10-24 at 13:52 -0700, Jakub Kicinski wrote: > On Tue, 24 Oct 2023 22:25:18 +0200 Johannes Berg wrote: > > Are you planning to merge net into net-next really soon for some reason? > > Submitting on Wed did cross my mind, but there's no solid plan. > Unless that changes, Paolo will submit net on Thursday, EU time. > And we'll cross-merge once Linux pulls. OK, sounds good. > > If not, I can resolve this conflict and we'll include it in the next > > (and last) wireless-next pull request, which will be going out Thursday > > morning (Europe time.) > > Sounds good! But do you need to do the resolution to put something > on top? Otherwise we can deal with the conflict when pulling. No, not really, nothing left that's not in wireless-next already (I think), except maybe some tiny cleanups. Just trying to make it easier for you, even if it's really not a complex conflict :) johannes
