[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAMRc=McuH20BpVTLDaEZnrg+uic2byqnPc5VuuDOh59p6fp=dA@mail.gmail.com>
Date: Thu, 23 Oct 2025 09:48:25 +0200
From: Bartosz Golaszewski <brgl@...ev.pl>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Linux Next Mailing List <linux-next@...r.kernel.org>, William Breathitt Gray <wbg@...nel.org>,
Ioana Ciornei <ioana.ciornei@....com>
Subject: Re: linux-next: duplicate patch in the gpio-brgl tree
On Thu, Oct 23, 2025 at 3:52 AM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Hi all,
>
> The following commit is also in the gpio-brgl-fixes tree as a different
> commit (but the same patch):
>
> ae495810cffe ("gpio: regmap: add the .fixed_direction_output configuration parameter")
>
> This is commit
>
> 00aaae60faf5 ("gpio: regmap: add the .fixed_direction_output configuration parameter")
>
> in the gpio-brgl-fixes tree.
>
Hi Stephen,
I had applied this as ae495810cffe to my v6.19 queue earlier into the
cycle. Then it turned out it's needed in v6.18 as part of a regression
fix. At this point it was too late for an immutable branch and I
didn't want to rebase my for-next tree. I decided to just cherry pick
it into for-current, send it upstream and then pull back v6.18-rc3
into my for-next and resolve the conflict. Does this work for you?
Bartosz
Powered by blists - more mailing lists