Hi all,

On Mon, 10 Feb 2025 04:43:28 +0530 Shuah Khan <sk...@linuxfoundation.org> wrote:
>
> On Sun, Feb 9, 2025, 2:44 AM Kees Cook <k...@kernel.org> wrote:
> 
> > On Fri, Oct 11, 2024 at 07:53:43AM -0600, Shuah Khan wrote:  
> > > On 10/11/24 01:25, David Gow wrote:  
> > > > As discussed in [1], the KUnit test naming scheme has changed to avoid
> > > > name conflicts (and tab-completion woes) with the files being tested.
> > > > These renames and moves have caused a nasty set of merge conflicts, so
> > > > this series collates and rebases them all to be applied via
> > > > mm-nonmm-unstable alongside any lib/ changes[2].
> >
> > Shall I carry this in the hardening tree? I didn't see it land in the
> > merge window, and I still don't see it in -next?
> >  
> 
> My thinking was that this series would go through Andrew's tree to avoid
> conflicts. Please take it through yours.

If they have been rebased onto mm-nonmm-unstable, then they really need
to go through Andrew' tree (since mm-nonmm-unstable gets rebased often).

-- 
Cheers,
Stephen Rothwell

Attachment: pgp6J5AZ7185E.pgp
Description: OpenPGP digital signature

Reply via email to