* linux-next: manual merge of the loongarch tree with the irqchip-fixes tree
@ 2022-08-10 23:17 Stephen Rothwell
2022-08-14 23:04 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2022-08-10 23:17 UTC (permalink / raw)
To: Huacai Chen, Marc Zyngier
Cc: Huacai Chen, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1304 bytes --]
Hi all,
Today's linux-next merge of the loongarch tree got a conflict in:
arch/loongarch/include/asm/irq.h
between commit:
fda7409a8fcf ("irqchip/loongson-pch-pic: Move find_pch_pic() into CONFIG_ACPI")
from the irqchip-fixes tree and commit:
4e9fa7e1c08d ("LoongArch: Parse MADT to get multi-processor information")
from the loongarch tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/loongarch/include/asm/irq.h
index 093aee99167d,4b130199ceae..000000000000
--- a/arch/loongarch/include/asm/irq.h
+++ b/arch/loongarch/include/asm/irq.h
@@@ -81,8 -81,7 +81,6 @@@ extern struct acpi_vector_group msi_gro
#define GSI_MIN_PCH_IRQ LOONGSON_PCH_IRQ_BASE
#define GSI_MAX_PCH_IRQ (LOONGSON_PCH_IRQ_BASE + 256 - 1)
- extern int eiointc_get_node(int id);
-
-extern int find_pch_pic(u32 gsi);
struct acpi_madt_lio_pic;
struct acpi_madt_eio_pic;
struct acpi_madt_ht_pic;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the loongarch tree with the irqchip-fixes tree
2022-08-10 23:17 linux-next: manual merge of the loongarch tree with the irqchip-fixes tree Stephen Rothwell
@ 2022-08-14 23:04 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2022-08-14 23:04 UTC (permalink / raw)
To: Marc Zyngier
Cc: Huacai Chen, Huacai Chen, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1577 bytes --]
Hi all,
On Thu, 11 Aug 2022 09:17:01 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the loongarch tree got a conflict in:
>
> arch/loongarch/include/asm/irq.h
>
> between commit:
>
> fda7409a8fcf ("irqchip/loongson-pch-pic: Move find_pch_pic() into CONFIG_ACPI")
>
> from the irqchip-fixes tree and commit:
>
> 4e9fa7e1c08d ("LoongArch: Parse MADT to get multi-processor information")
>
> from the loongarch tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc arch/loongarch/include/asm/irq.h
> index 093aee99167d,4b130199ceae..000000000000
> --- a/arch/loongarch/include/asm/irq.h
> +++ b/arch/loongarch/include/asm/irq.h
> @@@ -81,8 -81,7 +81,6 @@@ extern struct acpi_vector_group msi_gro
> #define GSI_MIN_PCH_IRQ LOONGSON_PCH_IRQ_BASE
> #define GSI_MAX_PCH_IRQ (LOONGSON_PCH_IRQ_BASE + 256 - 1)
>
> - extern int eiointc_get_node(int id);
> -
> -extern int find_pch_pic(u32 gsi);
> struct acpi_madt_lio_pic;
> struct acpi_madt_eio_pic;
> struct acpi_madt_ht_pic;
This is now a conflict between the irqchip-fixes tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-08-14 23:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-10 23:17 linux-next: manual merge of the loongarch tree with the irqchip-fixes tree Stephen Rothwell
2022-08-14 23:04 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox