Hi Stephen, On Fri, 10 May 2024 17:08:27 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > > Hi Bartosz, > > On Fri, 10 May 2024 08:33:37 +0200 Bartosz Golaszewski <bartosz.golaszewski@xxxxxxxxxx> 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 ... Or, since it is a pretty simple conflict, just do not merge and just mention the conflict to Linus in your merge window PR. -- Cheers, Stephen Rothwell
Attachment:
pgpEBnD2uxirc.pgp
Description: OpenPGP digital signature
