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>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20240729084117.3fd74b2c@canb.auug.org.au>
Date: Mon, 29 Jul 2024 08:41:17 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>, Lorenzo Stoakes
 <lorenzo.stoakes@...cle.com>, Wei Yang <richard.weiyang@...il.com>, Yury
 Norov <yury.norov@...il.com>
Subject: linux-next: manual merge of the mm tree with Linus' tree

Hi all,

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

  tools/testing/radix-tree/bitmap.c
(renamed to tools/testing/shared/bitmap.c in the mm-unstable branch of
the mm tree).

between commit:

  692a68ee9c3c ("radix tree test suite: put definition of bitmap_clear() into lib/bitmap.c")

from Linus' tree and commit:

  28b9ae6595be ("tools: separate out shared radix-tree components")

from the mm-unstable branch of the mm tree.

I fixed it up (I deleted the file) 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