linux-kernel - Re: linux-next: manual merge of the memblock 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>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20240923092120.797681e1@canb.auug.org.au>
Date: Mon, 23 Sep 2024 09:21:20 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Mike Rapoport <rppt@...nel.org>
Cc: Andrew Morton <akpm@...ux-foundation.org>, 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>
Subject: Re: linux-next: manual merge of the memblock tree with the mm tree

Hi all,

On Thu, 1 Aug 2024 14:10:47 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the memblock tree got a conflict in:
> 
>   tools/testing/shared/linux/init.h
> 
> between commit:
> 
>   265291d604a6 ("tools: separate out shared radix-tree components")
> 
> from the mm-unstable branch of the mm tree and commit:
> 
>   f56de2214554 ("tools/testing: abstract two init.h into common include directory")
> 
> from the memblock tree.
> 
> I fixed it up (I removed 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.

This is now a conflict between the memblock tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped