From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 63B58C5321D for ; Mon, 26 Aug 2024 21:19:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc: To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=43rARpIabmoF/X4nl2L65kxlo3pcBgpwUNSnL7OF7ag=; b=umTzBi7PJdOUGHKz5835o8y7vV d3uoLwXLQUZb8wcxQhdTLtTWmzPXqJuucuxdbPpLZjDqtXtw6WttRXaqGElVjIxMmcDMYfR8ru5vO YWMUw8N5ZuWn0xiXnEez30NmM658j2nhBI8NrRXauE1WEQy0bgV+SPlAngp9dP4fkc7S7T76pKeL6 R9NOpPWfTYs3Q3I0pKGYPh9KkFeMLZidwYMfyFYZfU5yGX3p+KJ/PjKUD5nd4cljRoVxMk3CBbv4N LrEBTK+/QagrGZYnPfeoNzwV+TdDm5L4KgEA7+Lp5lPHJf6yeouk5a2inQc3tPhUioPb+pPrBd7Nm VsDxnMzA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sih72-00000008mnu-2Wlj; Mon, 26 Aug 2024 21:18:56 +0000 Received: from galois.linutronix.de ([193.142.43.55]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sih5Y-00000008mLg-10KL; Mon, 26 Aug 2024 21:17:28 +0000 From: Thomas Gleixner DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1724707041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=43rARpIabmoF/X4nl2L65kxlo3pcBgpwUNSnL7OF7ag=; b=f+dwtiMZsAypPINdPYjJMSxRgqTYYkRX8/ijDCkQoPWJ6wCDNuvx/uJBedUE8MdqIizpaW +ZvQkcpLq2EeLwe0n7+8+6nBpIlb37VvRw0BGg6VbLv3/TFfOkuSw3rDzL/GHCPAt4dGVM BpcDb5jbzqkvlc2LyidGKMP9Y/3pbPqzRITxCECELeSY5iCO3IWvgZz6qgJSyHhqQeLlj/ vR9aVou0rW9G+a0AHY0ts5BGt9szTX/5GCABfbiR1OSlFuljxNlnyzBkJUU7p14T39I67m jO0jpSZXLqjYHuIFE+mo/WAeZpv5nyUxPYntSviUx32hXz79XZ1pUxDhl1a70A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1724707041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=43rARpIabmoF/X4nl2L65kxlo3pcBgpwUNSnL7OF7ag=; b=SukSGpuFtbwIxx+NKHCHDL12zE+JC0KFepVFOj288ZMYr7Gjw3F/W6yQ7GQ9sQxNW/LIH4 rx+3Wq+dLNzvGhDQ== To: "Rafael J. Wysocki" , Sunil V L Cc: "Rafael J. Wysocki" , Will Deacon , Paul Walmsley , Palmer Dabbelt , Albert Ou , Len Brown , Bjorn Helgaas , Anup Patel , Samuel Holland , Robert Moore , Conor Dooley , Haibo Xu , Andrew Jones , Atish Kumar Patra , Drew Fustini , 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 In-Reply-To: References: <20240812005929.113499-1-sunilvl@ventanamicro.com> <87mskzcnmf.ffs@tglx> Date: Mon, 26 Aug 2024 23:17:20 +0200 Message-ID: <87jzg3c7bz.ffs@tglx> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240826_141724_441470_8B88BD94 X-CRM114-Status: GOOD ( 10.03 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Aug 26 2024 at 19:27, Rafael J. Wysocki wrote: > On Mon, Aug 26, 2024 at 7:22=E2=80=AFPM Sunil V L 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 bas= e 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