The Linux Kernel Mailing List
 help / color / mirror / Atom feed
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'
Date: Fri, 24 May 2024 21:36:29 +0200	[thread overview]
Message-ID: <87y17zc88y.ffs@tglx> (raw)
In-Reply-To: <mhng-44d7a1c7-c15a-4077-ac94-23985f686474@palmer-ri-x1c9>

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

  reply	other threads:[~2024-05-24 19:36 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-15 14:18 riscv: irq-riscv-imsic-early.c:52:9: error: too many arguments to function 'riscv_ipi_set_virq_range' Naresh Kamboju
2024-05-15 14:36 ` Conor Dooley
2024-05-15 17:05   ` Palmer Dabbelt
2024-05-15 17:13     ` Anup Patel
2024-05-24 15:10     ` Guenter Roeck
2024-05-24 17:18       ` Thomas Gleixner
2024-05-24 17:35         ` Palmer Dabbelt
2024-05-24 19:36           ` Thomas Gleixner [this message]
2024-05-24 20:24             ` Guenter Roeck

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=87y17zc88y.ffs@tglx \
    --to=tglx@linutronix.de \
    --cc=anders.roxell@linaro.org \
    --cc=apatel@ventanamicro.com \
    --cc=arnd@arndb.de \
    --cc=conor@kernel.org \
    --cc=dan.carpenter@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-riscv@lists.infradead.org \
    --cc=linux@roeck-us.net \
    --cc=lkft-triage@lists.linaro.org \
    --cc=naresh.kamboju@linaro.org \
    --cc=palmer@dabbelt.com \
    --cc=regressions@lists.linux.dev \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox