From: Thomas Gleixner <tglx@linutronix.de>
To: "Rafael J. Wysocki" <rafael@kernel.org>,
Sunil V L <sunilvl@ventanamicro.com>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>,
Will Deacon <will@kernel.org>,
Paul Walmsley <paul.walmsley@sifive.com>,
Palmer Dabbelt <palmer@dabbelt.com>,
Albert Ou <aou@eecs.berkeley.edu>, Len Brown <lenb@kernel.org>,
Bjorn Helgaas <bhelgaas@google.com>,
Anup Patel <anup@brainfault.org>,
Samuel Holland <samuel.holland@sifive.com>,
Robert Moore <robert.moore@intel.com>,
Conor Dooley <conor.dooley@microchip.com>,
Haibo Xu <haibo1.xu@intel.com>,
Andrew Jones <ajones@ventanamicro.com>,
Atish Kumar Patra <atishp@rivosinc.com>,
Drew Fustini <dfustini@tenstorrent.com>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-riscv@lists.infradead.org, linux-acpi@vger.kernel.org,
acpica-devel@lists.linux.dev
Subject: Re: [PATCH v8 00/17] RISC-V: ACPI: Add external interrupt controller support
Date: Mon, 26 Aug 2024 23:17:20 +0200 [thread overview]
Message-ID: <87jzg3c7bz.ffs@tglx> (raw)
In-Reply-To: <CAJZ5v0hxoT9tBjm3xRPU4fHx3MgHfYAx_Vyf4oe2toa3GWAN+Q@mail.gmail.com>
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.
Thanks,
tglx
WARNING: multiple messages have this Message-ID (diff)
From: Thomas Gleixner <tglx@linutronix.de>
To: "Rafael J. Wysocki" <rafael@kernel.org>,
Sunil V L <sunilvl@ventanamicro.com>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>,
Will Deacon <will@kernel.org>,
Paul Walmsley <paul.walmsley@sifive.com>,
Palmer Dabbelt <palmer@dabbelt.com>,
Albert Ou <aou@eecs.berkeley.edu>, Len Brown <lenb@kernel.org>,
Bjorn Helgaas <bhelgaas@google.com>,
Anup Patel <anup@brainfault.org>,
Samuel Holland <samuel.holland@sifive.com>,
Robert Moore <robert.moore@intel.com>,
Conor Dooley <conor.dooley@microchip.com>,
Haibo Xu <haibo1.xu@intel.com>,
Andrew Jones <ajones@ventanamicro.com>,
Atish Kumar Patra <atishp@rivosinc.com>,
Drew Fustini <dfustini@tenstorrent.com>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-riscv@lists.infradead.org, linux-acpi@vger.kernel.org,
acpica-devel@lists.linux.dev
Subject: Re: [PATCH v8 00/17] RISC-V: ACPI: Add external interrupt controller support
Date: Mon, 26 Aug 2024 23:17:20 +0200 [thread overview]
Message-ID: <87jzg3c7bz.ffs@tglx> (raw)
In-Reply-To: <CAJZ5v0hxoT9tBjm3xRPU4fHx3MgHfYAx_Vyf4oe2toa3GWAN+Q@mail.gmail.com>
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.
Thanks,
tglx
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2024-08-26 21:17 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-12 0:59 [PATCH v8 00/17] RISC-V: ACPI: Add external interrupt controller support Sunil V L
2024-08-12 0:59 ` Sunil V L
2024-08-12 0:59 ` [PATCH v8 01/17] arm64: PCI: Migrate ACPI related functions to pci-acpi.c Sunil V L
2024-08-12 0:59 ` Sunil V L
2024-08-12 18:09 ` Bjorn Helgaas
2024-08-12 18:09 ` Bjorn Helgaas
2024-08-14 5:32 ` Sunil V L
2024-08-14 5:32 ` Sunil V L
2024-08-12 0:59 ` [PATCH v8 02/17] ACPI: scan: Add a weak arch_sort_irqchip_probe() to order the IRQCHIP probe Sunil V L
2024-08-12 0:59 ` Sunil V L
2024-08-12 0:59 ` [PATCH v8 03/17] ACPI: bus: Add acpi_riscv_init() function Sunil V L
2024-08-12 0:59 ` Sunil V L
2024-08-12 0:59 ` [PATCH v8 04/17] ACPI: scan: Refactor dependency creation Sunil V L
2024-08-12 0:59 ` Sunil V L
2024-08-12 0:59 ` [PATCH v8 05/17] ACPI: scan: Add RISC-V interrupt controllers to honor list Sunil V L
2024-08-12 0:59 ` Sunil V L
2024-08-12 0:59 ` [PATCH v8 06/17] ACPI: scan: Define weak function to populate dependencies Sunil V L
2024-08-12 0:59 ` Sunil V L
2024-08-12 0:59 ` [PATCH v8 07/17] ACPI: bus: Add RINTC IRQ model for RISC-V Sunil V L
2024-08-12 0:59 ` Sunil V L
2024-08-12 0:59 ` [PATCH v8 08/17] ACPI: pci_link: Clear the dependencies after probe Sunil V L
2024-08-12 0:59 ` Sunil V L
2024-08-22 21:44 ` Bjorn Helgaas
2024-08-22 21:44 ` Bjorn Helgaas
2024-08-23 6:33 ` Sunil V L
2024-08-23 6:33 ` Sunil V L
2024-08-23 17:45 ` Bjorn Helgaas
2024-08-23 17:45 ` Bjorn Helgaas
2024-08-12 0:59 ` [PATCH v8 09/17] ACPI: RISC-V: Implement PCI related functionality Sunil V L
2024-08-12 0:59 ` Sunil V L
2024-08-12 0:59 ` [PATCH v8 10/17] ACPI: RISC-V: Implement function to reorder irqchip probe entries Sunil V L
2024-08-12 0:59 ` Sunil V L
2024-08-12 0:59 ` [PATCH v8 11/17] ACPI: RISC-V: Initialize GSI mapping structures Sunil V L
2024-08-12 0:59 ` Sunil V L
2024-08-12 0:59 ` [PATCH v8 12/17] ACPI: RISC-V: Implement function to add implicit dependencies Sunil V L
2024-08-12 0:59 ` Sunil V L
2024-08-12 0:59 ` [PATCH v8 13/17] irqchip/riscv-intc: Add ACPI support for AIA Sunil V L
2024-08-12 0:59 ` Sunil V L
2024-08-12 0:59 ` [PATCH v8 14/17] irqchip/riscv-imsic-state: Create separate function for DT Sunil V L
2024-08-12 0:59 ` Sunil V L
2024-08-12 0:59 ` [PATCH v8 15/17] irqchip/riscv-imsic: Add ACPI support Sunil V L
2024-08-12 0:59 ` Sunil V L
2024-08-12 0:59 ` [PATCH v8 16/17] irqchip/riscv-aplic: " Sunil V L
2024-08-12 0:59 ` Sunil V L
2024-08-12 0:59 ` [PATCH v8 17/17] irqchip/sifive-plic: " Sunil V L
2024-08-12 0:59 ` Sunil V L
2024-08-12 1:07 ` [PATCH v8 00/17] RISC-V: ACPI: Add external interrupt controller support Sunil V L
2024-08-12 1:07 ` Sunil V L
2024-08-26 15:25 ` Thomas Gleixner
2024-08-26 15:25 ` Thomas Gleixner
2024-08-26 16:15 ` Rafael J. Wysocki
2024-08-26 16:15 ` Rafael J. Wysocki
2024-08-26 17:13 ` Sunil V L
2024-08-26 17:13 ` Sunil V L
2024-08-26 17:27 ` Rafael J. Wysocki
2024-08-26 17:27 ` Rafael J. Wysocki
2024-08-26 21:17 ` Thomas Gleixner [this message]
2024-08-26 21:17 ` Thomas Gleixner
2024-08-27 16:20 ` Rafael J. Wysocki
2024-08-27 16:20 ` Rafael J. Wysocki
2024-08-27 17:04 ` Sunil V L
2024-08-27 17:04 ` Sunil V L
2024-08-27 17:12 ` Rafael J. Wysocki
2024-08-27 17:12 ` Rafael J. Wysocki
2024-08-27 17:31 ` Sunil V L
2024-08-27 17:31 ` Sunil V L
2024-08-27 17:56 ` Rafael J. Wysocki
2024-08-27 17:56 ` Rafael J. Wysocki
2024-08-27 18:12 ` Sunil V L
2024-08-27 18:12 ` Sunil V L
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87jzg3c7bz.ffs@tglx \
--to=tglx@linutronix.de \
--cc=acpica-devel@lists.linux.dev \
--cc=ajones@ventanamicro.com \
--cc=anup@brainfault.org \
--cc=aou@eecs.berkeley.edu \
--cc=atishp@rivosinc.com \
--cc=bhelgaas@google.com \
--cc=conor.dooley@microchip.com \
--cc=dfustini@tenstorrent.com \
--cc=haibo1.xu@intel.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=rafael@kernel.org \
--cc=robert.moore@intel.com \
--cc=samuel.holland@sifive.com \
--cc=sunilvl@ventanamicro.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.