On Mon, Oct 23, 2023 at 10:22 AM Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx> wrote: > On 23/10/2023 10:19, Linus Walleij wrote: > > On Fri, Oct 13, 2023 at 4:59 PM Krzysztof Kozlowski > > <krzysztof.kozlowski@xxxxxxxxxx> wrote: > > > > > >> Changes in v2 > > > > I tried to apply this to the pinctrl devel branch: > > https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git/log/?h=devel > > > > It doesn't apply, could you rebase it? > > The context depends on my previous fix which you applied and sent for > v6.6 already: > https://lore.kernel.org/linux-arm-msm/CACRpkdaybnYEmkgv7VG4fh5sXQ7uwHm2wH2Khja-P1b6idYr8w@xxxxxxxxxxxxxx/ > > I can rebase, but I am afraid it will cause conflicts. Is it reasonable > for you to merge v6.6-rc7 into your devel branch? Torvalds is usually not super-happy when we do that, especially this late in the development cycle it gets a bit ugly with all the stuff that brings in. Can we wait with this patch set until the next development cycle or is it urgent? Yours, Linus Walleij
