Received-SPF: pass (google.com: domain of linux-kernel+bounces-181640-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Fri, 17 May 2024 09:42:19 +1000
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
Message-ID: <20240517094219.6a4f618a@canb.auug.org.au>
In-Reply-To: <20240515125404.5ffbaada@canb.auug.org.au>
References: <20240515125404.5ffbaada@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/o=RVMbxBToyvQbtEwVMaoE1";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/o=RVMbxBToyvQbtEwVMaoE1
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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:
>=20
>   arch/loongarch/kernel/irq.c
>=20
> between commit:
>=20
>   5685d7fcb55f ("LoongArch: Give a chance to build with !CONFIG_SMP")
>=20
> from the loongarch tree and commit:
>=20
>   316863cb62fe ("LoongArch/smp: Refine some ipi functions on LoongArch pl=
atform")
>=20
> from the kvm tree.
>=20
> 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.

--=20
Cheers,
Stephen Rothwell

--Sig_/o=RVMbxBToyvQbtEwVMaoE1
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZGmdsACgkQAVBC80lX
0GyYnggAoHkAcH1yudrcWWYykKNdOiAPmChnPhT34hThPHbuuo2Eo6V+OC7Ks6eO
F2v0+KrTyZJYRjxAHSeEDuT1SlZxax9hRYOH2JV1ugK2HXeAuxQY4u3HTfiIIP28
G4F3KLZpQfrFsoAkhfb/8wDyB/YvohpsiBfVEkerVZoKqNQUGUhODIa0gPvSSZLc
3vlXNIJwKaNigl2FDGtcsLMmZTNce9F/qo4ya2S99jtYlMaxRcz1BTk7GdmZcKPx
TN1AuGrQXDcWmutcc/0Rc2zFc6InBu0JOZDXLCrLWuiAZcrFLydrGknIXomraF1O
edm8Ww9lQNy2dS6auN9I7ocR+6FPZQ==
=Twam
-----END PGP SIGNATURE-----

--Sig_/o=RVMbxBToyvQbtEwVMaoE1--