linux-kernel - Re: linux-next: manual merge of the mm tree with Linus' 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: <20240728163149.9afe2eeddde34fae5e598047@linux-foundation.org>
Date: Sun, 28 Jul 2024 16:31:49 -0700
From: Andrew Morton <akpm@...ux-foundation.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
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: Re: linux-next: manual merge of the mm tree with Linus' tree

On Mon, 29 Jul 2024 08:45:39 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:

> > 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.
> 
> Actually, due to this and the conflict in
> tools/testing/radix-tree/Makefile, I decided to drop the
> mm tree for one more day while it gets sorted out.

Yup, thanks, Some unknown-about-by-us changes to the radix-tree test
code have just popped up in mainline.

I dropped the problematic series for now.  I'll be pushing it all out
in an hour or so.