linux-kernel - Re: linux-next: manual merge of the kunit-next 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 for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20241009134255.8083566505456b4f1159a6d2@linux-foundation.org>
Date: Wed, 9 Oct 2024 13:42:55 -0700
From: Andrew Morton <akpm@...ux-foundation.org>
To: Shuah Khan <skhan@...uxfoundation.org>
Cc: Stephen Rothwell <sfr@...b.auug.org.au>, Brendan Higgins
 <brendanhiggins@...gle.com>, David Gow <davidgow@...gle.com>, Bruno
 Sobreira França <brunofrancadevsec@...il.com>, Linux
 Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Luis Felipe Hernandez
 <luis.hernandez093@...il.com>
Subject: Re: linux-next: manual merge of the kunit-next tree with the mm
 tree

On Wed, 9 Oct 2024 09:11:19 -0600 Shuah Khan <skhan@...uxfoundation.org> wrote:

> > I fixed it up (I used the latter version of lib/math/Makefile and see
> > below the signature by the patch immediately below) 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.
> 
> Sorry for the delay on this. Thank you for fixing this up.
> 
> Andrew,
> 
> Looks like we might see more conflicts between mm and kunit trees
> with the move from lib/ lib/tests/
> 
> I dropped a couple of patches I couldn't apply. Would you like
> me to drop this from kunit tree?

Yes please, it's mostly a lib/ thing.

I can't actually find the original patch email.  f099bda563dd doesn't
have a Link: to the submission (please update your scripts to fix
this)  and the patch wasn't cc'ed to anything to which I subscribe
(please prefer to cc linux-kernel on most patches because of this).