Received-SPF: pass (google.com: domain of linux-kernel+bounces-189056-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: Thomas Gleixner <tglx@linutronix.de>
To: Palmer Dabbelt <palmer@dabbelt.com>
Cc: linux@roeck-us.net, Conor Dooley <conor@kernel.org>,
 naresh.kamboju@linaro.org, linux-kernel@vger.kernel.org,
 lkft-triage@lists.linaro.org, regressions@lists.linux.dev,
 linux-riscv@lists.infradead.org, apatel@ventanamicro.com,
 anders.roxell@linaro.org, dan.carpenter@linaro.org, Arnd Bergmann
 <arnd@arndb.de>
Subject: Re: riscv: irq-riscv-imsic-early.c:52:9: error: too many arguments
 to function 'riscv_ipi_set_virq_range'
In-Reply-To: <mhng-44d7a1c7-c15a-4077-ac94-23985f686474@palmer-ri-x1c9>
References: <mhng-44d7a1c7-c15a-4077-ac94-23985f686474@palmer-ri-x1c9>
Date: Fri, 24 May 2024 21:36:29 +0200
Message-ID: <87y17zc88y.ffs@tglx>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain

On Fri, May 24 2024 at 10:35, Palmer Dabbelt wrote:
> On Fri, 24 May 2024 10:18:42 PDT (-0700), tglx@linutronix.de wrote:
>> On Fri, May 24 2024 at 08:10, Guenter Roeck wrote:
>>> On Wed, May 15, 2024 at 10:05:59AM -0700, Palmer Dabbelt wrote:
>>>> as a conflict resolution, which IIUC should happen when Linus merges my next
>>>> PR.  So I'll try and remember to call that out.
>>>>
>>>
>>> Unfortunately it looks like the conflict resolution did not happen,
>>> and mainline builds are now affected.
>>
>> Fix is queued and goes to Linus tomorrow.
>
> Sorry I misesd this.  The PR I sent Linus this morning contains my fix 
> from earlier this week: 
> https://lore.kernel.org/linux-riscv/171647463438.13050.6219786365640043025.git-patchwork-notify@kernel.org/T/#t 

Happens. I don't rebase my try. I just mention it to Linus when I
send the pull request. It's the same change so the result is a NOOP and
not another conflict :)

Thanks,

        tglx