Hi Bartosz, On Fri, 10 May 2024 08:33:37 +0200 Bartosz Golaszewski wrote: > > Thanks! I will send the fixes upstream today and then pull v6.9 into > my tree before the merge window PR to fix this conflict. Or you could just merge your for-current branch into your for-next branch and avoid possible issues with all the rest of v6.9 ... -- Cheers, Stephen Rothwell