* Re: riscv: irq-riscv-imsic-early.c:52:9: error: too many arguments to function 'riscv_ipi_set_virq_range'
@ 2024-05-15 17:05 ` Palmer Dabbelt
0 siblings, 0 replies; 18+ messages in thread
From: Palmer Dabbelt @ 2024-05-15 17:05 UTC (permalink / raw)
To: Conor Dooley
Cc: naresh.kamboju, linux-kernel, lkft-triage, regressions,
linux-riscv, apatel, tglx, anders.roxell, dan.carpenter,
Arnd Bergmann
On Wed, 15 May 2024 07:36:33 PDT (-0700), Conor Dooley wrote:
> Palmer,
> This is the issue I point out to you on the call earlier:
Ya, thanks, I just hit it. Looks like it's a semantic conflict between
21a8f8a0eb35 ("irqchip: Add RISC-V incoming MSI controller early
driver") and dc892fb44322 ("riscv: Use IPIs for remote cache/TLB flushes
by default"). I think all we need is
diff --git a/drivers/irqchip/irq-riscv-imsic-early.c b/drivers/irqchip/irq-riscv-imsic-early.c
index 886418ec06cb..4fbb37074d29 100644
--- a/drivers/irqchip/irq-riscv-imsic-early.c
+++ b/drivers/irqchip/irq-riscv-imsic-early.c
@@ -49,7 +49,7 @@ static int __init imsic_ipi_domain_init(void)
return virq < 0 ? virq : -ENOMEM;
/* Set vIRQ range */
- riscv_ipi_set_virq_range(virq, IMSIC_NR_IPI, true);
+ riscv_ipi_set_virq_range(virq, IMSIC_NR_IPI);
/* Announce that IMSIC is providing IPIs */
pr_info("%pfwP: providing IPIs using interrupt %d\n", imsic->fwnode, IMSIC_IPI_ID);
as a conflict resolution, which IIUC should happen when Linus merges my
next PR. So I'll try and remember to call that out.
>
> On Wed, May 15, 2024 at 04:18:58PM +0200, Naresh Kamboju wrote:
>> The riscv builds failed on Linux next-20240515 tag due to following build
>> warnings / errors with gcc-13 and clang toolchain.
>>
>> Reported-by: Linux Kernel Functional Testing <lkft@linaro.org>
>>
>> Build Log:
>> -----
>> drivers/irqchip/irq-riscv-imsic-early.c: In function 'imsic_ipi_domain_init':
>> drivers/irqchip/irq-riscv-imsic-early.c:52:9: error: too many
>> arguments to function 'riscv_ipi_set_virq_range'
>> 52 | riscv_ipi_set_virq_range(virq, IMSIC_NR_IPI, true);
>> | ^~~~~~~~~~~~~~~~~~~~~~~~
>> In file included from include/linux/smp.h:119,
>> from include/linux/lockdep.h:14,
>> from include/linux/spinlock.h:63,
>> from include/linux/sched.h:2142,
>> from include/linux/ratelimit.h:6,
>> from include/linux/dev_printk.h:16,
>> from include/linux/device.h:15,
>> from include/linux/node.h:18,
>> from include/linux/cpu.h:17,
>> from drivers/irqchip/irq-riscv-imsic-early.c:8:
>> arch/riscv/include/asm/smp.h:52:6: note: declared here
>> 52 | void riscv_ipi_set_virq_range(int virq, int nr);
>> | ^~~~~~~~~~~~~~~~~~~~~~~~
>>
>> metadata:
>> git_describe: next-20240515
>> git_repo: https://gitlab.com/Linaro/lkft/mirrors/next/linux-next
>> git_sha: 82d92a9a1b9ea0ea52aff27cddd05009b4edad49
>> git_short_log: 82d92a9a1b9e ("Add linux-next specific files for 20240515")
>>
>> Links:
>> - https://qa-reports.linaro.org/lkft/linux-next-master/build/next-20240515/testrun/23894295/suite/build/test/gcc-13-lkftconfig/details/
>> - https://storage.tuxsuite.com/public/linaro/lkft/builds/2gUiKdxX7qM27ritMJT5pRyZhyi/
>> - https://qa-reports.linaro.org/lkft/linux-next-master/build/next-20240515/testrun/23894295/suite/build/test/gcc-13-lkftconfig/history/
>>
>> --
>> Linaro LKFT
>> https://lkft.linaro.org
>>
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: riscv: irq-riscv-imsic-early.c:52:9: error: too many arguments to function 'riscv_ipi_set_virq_range'
2024-05-15 17:05 ` Palmer Dabbelt
@ 2024-05-15 17:13 ` Anup Patel
-1 siblings, 0 replies; 18+ messages in thread
From: Anup Patel @ 2024-05-15 17:13 UTC (permalink / raw)
To: Palmer Dabbelt
Cc: Conor Dooley, naresh.kamboju, linux-kernel, lkft-triage,
regressions, linux-riscv, tglx, anders.roxell, dan.carpenter,
Arnd Bergmann
On Wed, May 15, 2024 at 10:36 PM Palmer Dabbelt <palmer@dabbelt.com> wrote:
>
> On Wed, 15 May 2024 07:36:33 PDT (-0700), Conor Dooley wrote:
> > Palmer,
> > This is the issue I point out to you on the call earlier:
>
> Ya, thanks, I just hit it. Looks like it's a semantic conflict between
> 21a8f8a0eb35 ("irqchip: Add RISC-V incoming MSI controller early
> driver") and dc892fb44322 ("riscv: Use IPIs for remote cache/TLB flushes
> by default"). I think all we need is
>
> diff --git a/drivers/irqchip/irq-riscv-imsic-early.c b/drivers/irqchip/irq-riscv-imsic-early.c
> index 886418ec06cb..4fbb37074d29 100644
> --- a/drivers/irqchip/irq-riscv-imsic-early.c
> +++ b/drivers/irqchip/irq-riscv-imsic-early.c
> @@ -49,7 +49,7 @@ static int __init imsic_ipi_domain_init(void)
> return virq < 0 ? virq : -ENOMEM;
>
> /* Set vIRQ range */
> - riscv_ipi_set_virq_range(virq, IMSIC_NR_IPI, true);
> + riscv_ipi_set_virq_range(virq, IMSIC_NR_IPI);
>
> /* Announce that IMSIC is providing IPIs */
> pr_info("%pfwP: providing IPIs using interrupt %d\n", imsic->fwnode, IMSIC_IPI_ID);
>
> as a conflict resolution, which IIUC should happen when Linus merges my
> next PR. So I'll try and remember to call that out.
Yes, your conflict resolution is correct.
Thanks,
Anup
>
> >
> > On Wed, May 15, 2024 at 04:18:58PM +0200, Naresh Kamboju wrote:
> >> The riscv builds failed on Linux next-20240515 tag due to following build
> >> warnings / errors with gcc-13 and clang toolchain.
> >>
> >> Reported-by: Linux Kernel Functional Testing <lkft@linaro.org>
> >>
> >> Build Log:
> >> -----
> >> drivers/irqchip/irq-riscv-imsic-early.c: In function 'imsic_ipi_domain_init':
> >> drivers/irqchip/irq-riscv-imsic-early.c:52:9: error: too many
> >> arguments to function 'riscv_ipi_set_virq_range'
> >> 52 | riscv_ipi_set_virq_range(virq, IMSIC_NR_IPI, true);
> >> | ^~~~~~~~~~~~~~~~~~~~~~~~
> >> In file included from include/linux/smp.h:119,
> >> from include/linux/lockdep.h:14,
> >> from include/linux/spinlock.h:63,
> >> from include/linux/sched.h:2142,
> >> from include/linux/ratelimit.h:6,
> >> from include/linux/dev_printk.h:16,
> >> from include/linux/device.h:15,
> >> from include/linux/node.h:18,
> >> from include/linux/cpu.h:17,
> >> from drivers/irqchip/irq-riscv-imsic-early.c:8:
> >> arch/riscv/include/asm/smp.h:52:6: note: declared here
> >> 52 | void riscv_ipi_set_virq_range(int virq, int nr);
> >> | ^~~~~~~~~~~~~~~~~~~~~~~~
> >>
> >> metadata:
> >> git_describe: next-20240515
> >> git_repo: https://gitlab.com/Linaro/lkft/mirrors/next/linux-next
> >> git_sha: 82d92a9a1b9ea0ea52aff27cddd05009b4edad49
> >> git_short_log: 82d92a9a1b9e ("Add linux-next specific files for 20240515")
> >>
> >> Links:
> >> - https://qa-reports.linaro.org/lkft/linux-next-master/build/next-20240515/testrun/23894295/suite/build/test/gcc-13-lkftconfig/details/
> >> - https://storage.tuxsuite.com/public/linaro/lkft/builds/2gUiKdxX7qM27ritMJT5pRyZhyi/
> >> - https://qa-reports.linaro.org/lkft/linux-next-master/build/next-20240515/testrun/23894295/suite/build/test/gcc-13-lkftconfig/history/
> >>
> >> --
> >> Linaro LKFT
> >> https://lkft.linaro.org
> >>
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: riscv: irq-riscv-imsic-early.c:52:9: error: too many arguments to function 'riscv_ipi_set_virq_range'
@ 2024-05-15 17:13 ` Anup Patel
0 siblings, 0 replies; 18+ messages in thread
From: Anup Patel @ 2024-05-15 17:13 UTC (permalink / raw)
To: Palmer Dabbelt
Cc: Conor Dooley, naresh.kamboju, linux-kernel, lkft-triage,
regressions, linux-riscv, tglx, anders.roxell, dan.carpenter,
Arnd Bergmann
On Wed, May 15, 2024 at 10:36 PM Palmer Dabbelt <palmer@dabbelt.com> wrote:
>
> On Wed, 15 May 2024 07:36:33 PDT (-0700), Conor Dooley wrote:
> > Palmer,
> > This is the issue I point out to you on the call earlier:
>
> Ya, thanks, I just hit it. Looks like it's a semantic conflict between
> 21a8f8a0eb35 ("irqchip: Add RISC-V incoming MSI controller early
> driver") and dc892fb44322 ("riscv: Use IPIs for remote cache/TLB flushes
> by default"). I think all we need is
>
> diff --git a/drivers/irqchip/irq-riscv-imsic-early.c b/drivers/irqchip/irq-riscv-imsic-early.c
> index 886418ec06cb..4fbb37074d29 100644
> --- a/drivers/irqchip/irq-riscv-imsic-early.c
> +++ b/drivers/irqchip/irq-riscv-imsic-early.c
> @@ -49,7 +49,7 @@ static int __init imsic_ipi_domain_init(void)
> return virq < 0 ? virq : -ENOMEM;
>
> /* Set vIRQ range */
> - riscv_ipi_set_virq_range(virq, IMSIC_NR_IPI, true);
> + riscv_ipi_set_virq_range(virq, IMSIC_NR_IPI);
>
> /* Announce that IMSIC is providing IPIs */
> pr_info("%pfwP: providing IPIs using interrupt %d\n", imsic->fwnode, IMSIC_IPI_ID);
>
> as a conflict resolution, which IIUC should happen when Linus merges my
> next PR. So I'll try and remember to call that out.
Yes, your conflict resolution is correct.
Thanks,
Anup
>
> >
> > On Wed, May 15, 2024 at 04:18:58PM +0200, Naresh Kamboju wrote:
> >> The riscv builds failed on Linux next-20240515 tag due to following build
> >> warnings / errors with gcc-13 and clang toolchain.
> >>
> >> Reported-by: Linux Kernel Functional Testing <lkft@linaro.org>
> >>
> >> Build Log:
> >> -----
> >> drivers/irqchip/irq-riscv-imsic-early.c: In function 'imsic_ipi_domain_init':
> >> drivers/irqchip/irq-riscv-imsic-early.c:52:9: error: too many
> >> arguments to function 'riscv_ipi_set_virq_range'
> >> 52 | riscv_ipi_set_virq_range(virq, IMSIC_NR_IPI, true);
> >> | ^~~~~~~~~~~~~~~~~~~~~~~~
> >> In file included from include/linux/smp.h:119,
> >> from include/linux/lockdep.h:14,
> >> from include/linux/spinlock.h:63,
> >> from include/linux/sched.h:2142,
> >> from include/linux/ratelimit.h:6,
> >> from include/linux/dev_printk.h:16,
> >> from include/linux/device.h:15,
> >> from include/linux/node.h:18,
> >> from include/linux/cpu.h:17,
> >> from drivers/irqchip/irq-riscv-imsic-early.c:8:
> >> arch/riscv/include/asm/smp.h:52:6: note: declared here
> >> 52 | void riscv_ipi_set_virq_range(int virq, int nr);
> >> | ^~~~~~~~~~~~~~~~~~~~~~~~
> >>
> >> metadata:
> >> git_describe: next-20240515
> >> git_repo: https://gitlab.com/Linaro/lkft/mirrors/next/linux-next
> >> git_sha: 82d92a9a1b9ea0ea52aff27cddd05009b4edad49
> >> git_short_log: 82d92a9a1b9e ("Add linux-next specific files for 20240515")
> >>
> >> Links:
> >> - https://qa-reports.linaro.org/lkft/linux-next-master/build/next-20240515/testrun/23894295/suite/build/test/gcc-13-lkftconfig/details/
> >> - https://storage.tuxsuite.com/public/linaro/lkft/builds/2gUiKdxX7qM27ritMJT5pRyZhyi/
> >> - https://qa-reports.linaro.org/lkft/linux-next-master/build/next-20240515/testrun/23894295/suite/build/test/gcc-13-lkftconfig/history/
> >>
> >> --
> >> Linaro LKFT
> >> https://lkft.linaro.org
> >>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: riscv: irq-riscv-imsic-early.c:52:9: error: too many arguments to function 'riscv_ipi_set_virq_range'
2024-05-15 17:05 ` Palmer Dabbelt
@ 2024-05-24 15:10 ` Guenter Roeck
-1 siblings, 0 replies; 18+ messages in thread
From: Guenter Roeck @ 2024-05-24 15:10 UTC (permalink / raw)
To: Palmer Dabbelt
Cc: Conor Dooley, naresh.kamboju, linux-kernel, lkft-triage,
regressions, linux-riscv, apatel, tglx, anders.roxell,
dan.carpenter, Arnd Bergmann
On Wed, May 15, 2024 at 10:05:59AM -0700, Palmer Dabbelt wrote:
> On Wed, 15 May 2024 07:36:33 PDT (-0700), Conor Dooley wrote:
> > Palmer,
> > This is the issue I point out to you on the call earlier:
>
> Ya, thanks, I just hit it. Looks like it's a semantic conflict between
> 21a8f8a0eb35 ("irqchip: Add RISC-V incoming MSI controller early driver")
> and dc892fb44322 ("riscv: Use IPIs for remote cache/TLB flushes by
> default"). I think all we need is
>
> diff --git a/drivers/irqchip/irq-riscv-imsic-early.c b/drivers/irqchip/irq-riscv-imsic-early.c
> index 886418ec06cb..4fbb37074d29 100644
> --- a/drivers/irqchip/irq-riscv-imsic-early.c
> +++ b/drivers/irqchip/irq-riscv-imsic-early.c
> @@ -49,7 +49,7 @@ static int __init imsic_ipi_domain_init(void)
> return virq < 0 ? virq : -ENOMEM;
>
> /* Set vIRQ range */
> - riscv_ipi_set_virq_range(virq, IMSIC_NR_IPI, true);
> + riscv_ipi_set_virq_range(virq, IMSIC_NR_IPI);
>
> /* Announce that IMSIC is providing IPIs */
> pr_info("%pfwP: providing IPIs using interrupt %d\n", imsic->fwnode, IMSIC_IPI_ID);
>
> 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.
Guenter
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: riscv: irq-riscv-imsic-early.c:52:9: error: too many arguments to function 'riscv_ipi_set_virq_range'
@ 2024-05-24 15:10 ` Guenter Roeck
0 siblings, 0 replies; 18+ messages in thread
From: Guenter Roeck @ 2024-05-24 15:10 UTC (permalink / raw)
To: Palmer Dabbelt
Cc: Conor Dooley, naresh.kamboju, linux-kernel, lkft-triage,
regressions, linux-riscv, apatel, tglx, anders.roxell,
dan.carpenter, Arnd Bergmann
On Wed, May 15, 2024 at 10:05:59AM -0700, Palmer Dabbelt wrote:
> On Wed, 15 May 2024 07:36:33 PDT (-0700), Conor Dooley wrote:
> > Palmer,
> > This is the issue I point out to you on the call earlier:
>
> Ya, thanks, I just hit it. Looks like it's a semantic conflict between
> 21a8f8a0eb35 ("irqchip: Add RISC-V incoming MSI controller early driver")
> and dc892fb44322 ("riscv: Use IPIs for remote cache/TLB flushes by
> default"). I think all we need is
>
> diff --git a/drivers/irqchip/irq-riscv-imsic-early.c b/drivers/irqchip/irq-riscv-imsic-early.c
> index 886418ec06cb..4fbb37074d29 100644
> --- a/drivers/irqchip/irq-riscv-imsic-early.c
> +++ b/drivers/irqchip/irq-riscv-imsic-early.c
> @@ -49,7 +49,7 @@ static int __init imsic_ipi_domain_init(void)
> return virq < 0 ? virq : -ENOMEM;
>
> /* Set vIRQ range */
> - riscv_ipi_set_virq_range(virq, IMSIC_NR_IPI, true);
> + riscv_ipi_set_virq_range(virq, IMSIC_NR_IPI);
>
> /* Announce that IMSIC is providing IPIs */
> pr_info("%pfwP: providing IPIs using interrupt %d\n", imsic->fwnode, IMSIC_IPI_ID);
>
> 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.
Guenter
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: riscv: irq-riscv-imsic-early.c:52:9: error: too many arguments to function 'riscv_ipi_set_virq_range'
2024-05-24 15:10 ` Guenter Roeck
@ 2024-05-24 17:18 ` Thomas Gleixner
-1 siblings, 0 replies; 18+ messages in thread
From: Thomas Gleixner @ 2024-05-24 17:18 UTC (permalink / raw)
To: Guenter Roeck, Palmer Dabbelt
Cc: Conor Dooley, naresh.kamboju, linux-kernel, lkft-triage,
regressions, linux-riscv, apatel, anders.roxell, dan.carpenter,
Arnd Bergmann
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.
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: riscv: irq-riscv-imsic-early.c:52:9: error: too many arguments to function 'riscv_ipi_set_virq_range'
@ 2024-05-24 17:18 ` Thomas Gleixner
0 siblings, 0 replies; 18+ messages in thread
From: Thomas Gleixner @ 2024-05-24 17:18 UTC (permalink / raw)
To: Guenter Roeck, Palmer Dabbelt
Cc: Conor Dooley, naresh.kamboju, linux-kernel, lkft-triage,
regressions, linux-riscv, apatel, anders.roxell, dan.carpenter,
Arnd Bergmann
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.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: riscv: irq-riscv-imsic-early.c:52:9: error: too many arguments to function 'riscv_ipi_set_virq_range'
2024-05-24 17:18 ` Thomas Gleixner
@ 2024-05-24 17:35 ` Palmer Dabbelt
-1 siblings, 0 replies; 18+ messages in thread
From: Palmer Dabbelt @ 2024-05-24 17:35 UTC (permalink / raw)
To: tglx
Cc: linux, Conor Dooley, naresh.kamboju, linux-kernel, lkft-triage,
regressions, linux-riscv, apatel, anders.roxell, dan.carpenter,
Arnd Bergmann
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
.
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: riscv: irq-riscv-imsic-early.c:52:9: error: too many arguments to function 'riscv_ipi_set_virq_range'
@ 2024-05-24 17:35 ` Palmer Dabbelt
0 siblings, 0 replies; 18+ messages in thread
From: Palmer Dabbelt @ 2024-05-24 17:35 UTC (permalink / raw)
To: tglx
Cc: linux, Conor Dooley, naresh.kamboju, linux-kernel, lkft-triage,
regressions, linux-riscv, apatel, anders.roxell, dan.carpenter,
Arnd Bergmann
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
.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: riscv: irq-riscv-imsic-early.c:52:9: error: too many arguments to function 'riscv_ipi_set_virq_range'
2024-05-24 17:35 ` Palmer Dabbelt
@ 2024-05-24 19:36 ` Thomas Gleixner
-1 siblings, 0 replies; 18+ messages in thread
From: Thomas Gleixner @ 2024-05-24 19:36 UTC (permalink / raw)
To: Palmer Dabbelt
Cc: linux, Conor Dooley, naresh.kamboju, linux-kernel, lkft-triage,
regressions, linux-riscv, apatel, anders.roxell, dan.carpenter,
Arnd Bergmann
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
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: riscv: irq-riscv-imsic-early.c:52:9: error: too many arguments to function 'riscv_ipi_set_virq_range'
@ 2024-05-24 19:36 ` Thomas Gleixner
0 siblings, 0 replies; 18+ messages in thread
From: Thomas Gleixner @ 2024-05-24 19:36 UTC (permalink / raw)
To: Palmer Dabbelt
Cc: linux, Conor Dooley, naresh.kamboju, linux-kernel, lkft-triage,
regressions, linux-riscv, apatel, anders.roxell, dan.carpenter,
Arnd Bergmann
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
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: riscv: irq-riscv-imsic-early.c:52:9: error: too many arguments to function 'riscv_ipi_set_virq_range'
2024-05-24 19:36 ` Thomas Gleixner
@ 2024-05-24 20:24 ` Guenter Roeck
-1 siblings, 0 replies; 18+ messages in thread
From: Guenter Roeck @ 2024-05-24 20:24 UTC (permalink / raw)
To: Thomas Gleixner, Palmer Dabbelt
Cc: Conor Dooley, naresh.kamboju, linux-kernel, lkft-triage,
regressions, linux-riscv, apatel, anders.roxell, dan.carpenter,
Arnd Bergmann
On 5/24/24 12:36, Thomas Gleixner wrote:
> 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 :)
>
For my part I did try to find out if a fix had been submitted before sending
my note. Unfortunately I missed it. The problem is now fixed upstream.
Sorry for the noise.
Guenter
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: riscv: irq-riscv-imsic-early.c:52:9: error: too many arguments to function 'riscv_ipi_set_virq_range'
@ 2024-05-24 20:24 ` Guenter Roeck
0 siblings, 0 replies; 18+ messages in thread
From: Guenter Roeck @ 2024-05-24 20:24 UTC (permalink / raw)
To: Thomas Gleixner, Palmer Dabbelt
Cc: Conor Dooley, naresh.kamboju, linux-kernel, lkft-triage,
regressions, linux-riscv, apatel, anders.roxell, dan.carpenter,
Arnd Bergmann
On 5/24/24 12:36, Thomas Gleixner wrote:
> 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 :)
>
For my part I did try to find out if a fix had been submitted before sending
my note. Unfortunately I missed it. The problem is now fixed upstream.
Sorry for the noise.
Guenter
^ permalink raw reply [flat|nested] 18+ messages in thread