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: <20211208163130.4ec2ac9f@canb.auug.org.au>
Date:   Wed, 8 Dec 2021 16:31:30 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Yury Norov <yury.norov@...il.com>,
        Michael Ellerman <mpe@...erman.id.au>,
        PowerPC <linuxppc-dev@...ts.ozlabs.org>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Nicholas Piggin <npiggin@...il.com>
Subject: linux-next: manual merge of the bitmap tree with the powerpc tree

Hi all,

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

  arch/powerpc/include/asm/cputhreads.h

between commit:

  b350111bf7b3 ("powerpc: remove cpu_online_cores_map function")

from the powerpc tree and commit:

  4e258d05437b ("cpumask: replace cpumask_next_* with cpumask_first_* where appropriate")

from the bitmap tree.

I fixed it up (the former removed the code updated by the latter, so I
just used that) 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