Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
Date:   Tue, 15 Aug 2023 13:33:44 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>, Huacai Chen <chenhuacai@loongson.cn>
Cc:     Huacai Chen <chenhuacai@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Song Liu <song@kernel.org>, WANG Xuerui <git@xen0n.name>
Subject: linux-next: manual merge of the block tree with the loongarch tree
Message-ID: <20230815133344.065973e4@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/wZwGBSGFO4kMbathJvWW4Yd";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

Today's linux-next merge of the block tree got a conflict in:

  lib/raid6/test/Makefile

between commits:

  cc801d708472 ("raid6: Add LoongArch SIMD syndrome calculation")
  810a9b654cee ("raid6: Add LoongArch SIMD recovery implementation")

from the loongarch tree and commit:

  02ccfde87432 ("raid6: test: only check for Altivec if building on powerpc=
 hosts")

from the block tree.

I fixed it up (the changes in 02ccfde87432 are also in cc801d708472, so
I just used the former verion) 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_/wZwGBSGFO4kMbathJvWW4Yd
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmTa8hgACgkQAVBC80lX
0GzZ6gf/cF9nkkTBc/IpBPjtE7xuKh1aKcz13D6xRfD2NzQ7KDSS1dhuNTtSLStP
x8Xlol9WLcNIpCp+0C/eOXd2+c+1zMRSNk596X4GmLrmc8wmCERlPozblCrHtdQk
BhleUEp1qJZbSFpW/UMlsIEjEDZDMp+zXyNdjCa5f/iSY4HeywmLc33twlzTQAsd
7/KlCpBXAMRx8TZQch5+OZImPLjAnnVFZ4v9uSjrxb8iXr87zLGvJjRUvRieo8Rc
VPCuWfjxPs9rX7XwzpUUQDAAcmQi7lDao8n4CXs/2Pi7XB4JGmq/3eUXeywIdFAY
Gmb4rqnAPH6KZgnJj3aoT7ysJfRbug==
=HMnT
-----END PGP SIGNATURE-----

--Sig_/wZwGBSGFO4kMbathJvWW4Yd--