Received-SPF: pass (google.com: domain of linux-kernel+bounces-179362-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Wed, 15 May 2024 12:54:04 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paolo Bonzini <pbonzini@redhat.com>, KVM <kvm@vger.kernel.org>, Huacai
 Chen <chenhuacai@loongson.cn>
Cc: 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: linux-next: manual merge of the kvm tree with the loongarch tree
Message-ID: <20240515125404.5ffbaada@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/o_MYjImIFPwNGrSQLBO1o6j";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi all,

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 plat=
form")

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.

--=20
Cheers,
Stephen Rothwell

--Sig_/o_MYjImIFPwNGrSQLBO1o6j
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZEI8wACgkQAVBC80lX
0GytFAf+LwzWmlb8+iyV3iC1tKJKoM+QdKdzMfUejvrZdKabf64GAniBKDs3lsG9
QoW12zerBpcB3PjbEz1qJ02Ph/5YfrgScsACfSBtQjGCGel65+0qokxnd1ZgOOX5
7rm+u5uaG6dxN1ZKkQRfJSITwksiewkL296VJWZd0YNjgUA4E+u9CAGwfdCetOGR
dTnDYNi1ys2oy6Yx2PYHPgQjtz/o/6Yu9exXlGtxfAxmwuNFQeToHUPhEy6UQ49M
AJNl5LdVWM7ywSP5EPYvmlnEnQguQGL1gaOW/JgmjbVqLorL1QOUH5wcsEb6DVZd
Rw4REV3p/09kOqC27mzzzzHDRFBiqg==
=KwgP
-----END PGP SIGNATURE-----

--Sig_/o_MYjImIFPwNGrSQLBO1o6j--