Subject: Re: linux-next: manual merge of the loongarch tree with the irqchip-fixes tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 15 Aug 2022 09:04:35 +1000

Hi all,

On Thu, 11 Aug 2022 09:17:01 +1000 Stephen Rothwell <[email-masked]> 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