Re: [GIT PULL] move-lib-kunit for v6.15-rc1

[Kees Cook]

On Tue, Mar 18, 2025 at 08:44:10AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> On Mon, 17 Mar 2025 08:47:13 -0700 Kees Cook <kees@xxxxxxxxxx> wrote:
> >
> > Please pull the move-lib-kunit tree for v6.15-rc1. This is a one-off tree
> > to coordinate the move of selftests out of lib/ and into lib/tests/. A
> > separate tree was used for this to keep the paths sane with all the
> > work in the same place. Doing this across multiple trees was going to
> > be very difficult, so any on-going updates were collected here to try to
> > avoid merge conflicts. I think only one small conflict remains, just
> > today, detailed here:
> > https://lore.kernel.org/linux-next/20250317213953.01ca90e9@xxxxxxxxxxxxxxxx/
> > sfr's resolution looks correct.
> 
> There was also
> 
> https://lore.kernel.org/linux-next/20250213151927.1674562e@xxxxxxxxxxxxxxxx/

Ah! Yes, thank you. :) This resolution also looks correct.

-- 
Kees Cook