Re: [PATCH v8 00/17] RISC-V: ACPI: Add external interrupt controller support

Rafael J. Wysocki
2024-08-27T16:20:36Z

On Mon, Aug 26, 2024 at 11:22 PM Thomas Gleixner <tglx@linutronix.de> wrote:
>
> On Mon, Aug 26 2024 at 19:27, Rafael J. Wysocki wrote:
> > On Mon, Aug 26, 2024 at 7:22 PM Sunil V L <sunilvl@ventanamicro.com> wrote:
> >> There will be a conflict in PLIC irqchip driver due to a recent patch [1].
> >> This patch is not in latest RC5 release but in linux-next. I usually base the
> >> series on latest RC release. Should I rebase to linux-next in this case
> >> and send the next revision of the series resolving the conflict?
> >
> > No, please don't.
> >
> > That will be resolved at the merge time.
>
> Alternatively you can pull
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq-urgent-2024-08-25
>
> which I'm about to send to Linus latest tomorrow morning. That contains
> the conflicting change.

So I've applied the series on top of the above.

This included a full-swing rebase of the last patch, which I hope I've
done correctly, but Sunil please see

https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git/commit/?h=bleeding-edge&id=5d1b549883c1bba331c419e491fda9bb934ea202

and let me know.

Thanks!