linux-kernel - linux-next: manual merge of the bitmap tree with the mm tree

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: <20240503155215.22466d02@canb.auug.org.au>
Date: Fri, 3 May 2024 15:52:15 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Yury Norov <yury.norov@...il.com>, Andrew Morton
 <akpm@...ux-foundation.org>
Cc: Kuan-Wei Chiu <visitorckw@...il.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the bitmap tree with the mm tree

Hi all,

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

  include/linux/bitops.h

between commit:

  120c5991cbae ("bitops: optimize fns() for improved performance")

from the mm-nonmm-unstable branch of the mm tree and commit:

  1b6ef2812522 ("bitops: Optimize fns() for improved performance")

from the bitmap tree.

I fixed it up (I just used the latter as it had a more recent date) 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