lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20230815133344.065973e4@canb.auug.org.au>
Date:   Tue, 15 Aug 2023 13:33:44 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Jens Axboe <axboe@...nel.dk>, Huacai Chen <chenhuacai@...ngson.cn>
Cc:     Huacai Chen <chenhuacai@...nel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Song Liu <song@...nel.org>, WANG Xuerui <git@...0n.name>
Subject: linux-next: manual merge of the block tree with the loongarch tree

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.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ