From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Marc Zyngier <maz@kernel•org>
Cc: Huacai Chen <chenhuacai@loongson•cn>,
Huacai Chen <chenhuacai@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the loongarch tree with the irqchip-fixes tree
Date: Mon, 15 Aug 2022 09:04:35 +1000 [thread overview]
Message-ID: <20220815090435.09409f18@canb.auug.org.au> (raw)
In-Reply-To: <20220811091701.1dfd4e6c@canb.auug.org.au>
[-- 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 --]
prev parent reply other threads:[~2022-08-14 23:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
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=20220815090435.09409f18@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=chenhuacai@kernel$(echo .)org \
--cc=chenhuacai@loongson$(echo .)cn \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=maz@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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