Messages in this thread | | | Date | Fri, 10 May 2024 17:10:49 +1000 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the gpio-brgl tree with the gpio-brgl-fixes tree |
| |
Hi Stephen,
On Fri, 10 May 2024 17:08:27 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Hi Bartosz, > > On Fri, 10 May 2024 08:33:37 +0200 Bartosz Golaszewski <bartosz.golaszewski@linaro.org> 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 [unhandled content-type:application/pgp-signature] | |