From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Huacai Chen <chenhuacai@loongson•cn>
Cc: Paolo Bonzini <pbonzini@redhat•com>, KVM <kvm@vger•kernel.org>,
Bibo Mao <maobibo@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>,
Tiezhu Yang <yangtiezhu@loongson•cn>
Subject: Re: linux-next: manual merge of the kvm tree with the loongarch tree
Date: Fri, 17 May 2024 09:42:19 +1000 [thread overview]
Message-ID: <20240517094219.6a4f618a@canb.auug.org.au> (raw)
In-Reply-To: <20240515125404.5ffbaada@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1045 bytes --]
Hi all,
On Wed, 15 May 2024 12:54:04 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the kvm tree got a conflict in:
>
> arch/loongarch/kernel/irq.c
>
> between commit:
>
> 5685d7fcb55f ("LoongArch: Give a chance to build with !CONFIG_SMP")
>
> from the loongarch tree and commit:
>
> 316863cb62fe ("LoongArch/smp: Refine some ipi functions on LoongArch platform")
>
> from the kvm tree.
>
> I fixed it up (the latter removed a function that was made protected by
> CONFIG_SMP in the former - I just removed it) 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.
This is now a conflict between the loongarch tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2024-05-16 23:42 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-15 2:54 linux-next: manual merge of the kvm tree with the loongarch tree Stephen Rothwell
2024-05-16 23:42 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-02-27 3:09 Stephen Rothwell
2024-03-17 23:10 ` Stephen Rothwell
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=20240517094219.6a4f618a@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=chenhuacai@kernel$(echo .)org \
--cc=chenhuacai@loongson$(echo .)cn \
--cc=kvm@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=maobibo@loongson$(echo .)cn \
--cc=pbonzini@redhat$(echo .)com \
--cc=yangtiezhu@loongson$(echo .)cn \
/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