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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAJZ5v0i-8N8VG-D4FRh0qFxt44Ax4TKY_CiFhZxLCzkhQrt0=Q@mail.gmail.com>
Date: Tue, 27 Aug 2024 19:12:11 +0200
From: "Rafael J. Wysocki" <rafael@...nel.org>
To: Sunil V L <sunilvl@...tanamicro.com>
Cc: "Rafael J. Wysocki" <rafael@...nel.org>, Thomas Gleixner <tglx@...utronix.de>, Will Deacon <will@...nel.org>, 
	Paul Walmsley <paul.walmsley@...ive.com>, Palmer Dabbelt <palmer@...belt.com>, 
	Albert Ou <aou@...s.berkeley.edu>, Len Brown <lenb@...nel.org>, 
	Bjorn Helgaas <bhelgaas@...gle.com>, Anup Patel <anup@...infault.org>, 
	Samuel Holland <samuel.holland@...ive.com>, Robert Moore <robert.moore@...el.com>, 
	Conor Dooley <conor.dooley@...rochip.com>, Haibo Xu <haibo1.xu@...el.com>, 
	Andrew Jones <ajones@...tanamicro.com>, Atish Kumar Patra <atishp@...osinc.com>, 
	Drew Fustini <dfustini@...storrent.com>, linux-kernel@...r.kernel.org, 
	linux-arm-kernel@...ts.infradead.org, linux-riscv@...ts.infradead.org, 
	linux-acpi@...r.kernel.org, acpica-devel@...ts.linux.dev
Subject: Re: [PATCH v8 00/17] RISC-V: ACPI: Add external interrupt controller support

On Tue, Aug 27, 2024 at 7:04 PM Sunil V L <sunilvl@...tanamicro.com> 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@...utronix.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@...tanamicro.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.
> >
> 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?