On Tue, Aug 27, 2024 at 07:12:11PM +0200, Rafael J. Wysocki wrote: > On Tue, Aug 27, 2024 at 7:04 PM Sunil V L <sunilvl@xxxxxxxxxxxxxxxx> wrote: > > > > On Tue, Aug 27, 2024 at 06:20:24PM +0200, Rafael J. Wysocki wrote: > > > On Mon, Aug 26, 2024 at 11:22 PM Thomas Gleixner <tglx@xxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxx> 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. > > > > > Thanks! > > > > > This included a full-swing rebase of the last patch, which I hope I've > > > done correctly, but Sunil please see > > > > > Yeah, sorry about that. You have resolved most of the conflicts but few > > are missing (which were not obvious anyway). Could you please take below > > commit and squash? > > > > https://github.com/vlsunil/linux/commit/c85f9d0dc31c0e77916ecdbb457748c05cf4e75a > > Can you please send me a diff? > Hi Rafael, I have sent the diff to you. Hope that is fine. Thanks! Sunil
