On Tue, Oct 03, 2023 at 03:20:30PM -0700, Jakub Kicinski wrote: > On Tue, 3 Oct 2023 06:46:17 -0700 Yury Norov wrote: > > Can you elaborate on the conflicts you see? For me it applies cleanly > > on current master, and with some 3-way merging on latest -next... > > We're half way thru the release cycle the conflicts can still come in. > > There's no dependency for the first patch. The most normal way to > handle this would be to send patch 1 to the networking tree and send > the rest in the subsequent merge window. Ah, I understand now. I didn't plan to move it in current merge window. In fact, I'll be more comfortable to keep it in -next for longer and merge it in v6.7. But it's up to you. If you think it's better, I can resend 1st patch separately. Thanks, Yury
