Re: linux-next: manual merge of the kunit-next tree with the mm tree

Andrew Morton
2024-10-10T20:21:17Z

On Thu, 10 Oct 2024 17:32:33 +0800 David Gow <davidgow@google.com> wrote:

> On Thu, 10 Oct 2024 at 05:36, Andrew Morton <akpm@linux-foundation.org> wrote:
> >
> > On Wed, 9 Oct 2024 15:00:19 -0600 Shuah Khan <skhan@linuxfoundation.org> wrote:
> >
> > > > Andrew,
> > > > Another one related to move from lib/ lib/tests/
> > > >
> > > > If you would like to take these patches - it is perfectly
> > > > fine with me. If not I can handle these.
> > >
> > > Andrew,
> > >
> > > I dropped this one from linux-kselftest kunit branch.
> > > The link to this patch if it isn't in your Inbox:
> > >
> > > https://lore.kernel.org/all/20240924032200.167622-1-luis.hernandez093@gmail.com/
> > > >
> > > > Adding David as well for feedback on this
> > >
> > > David, I think lib/ kunit patches can go through Andrew's tree.
> > > Renaming is causing merge conflicts.
> > >
> >
> > Cool. David, I think it's simplest to just resend everything please.
>
> No worries: a few of these patches need some small fixes / rebases
> anyway, so I'll make sure those happen and send them all as one
> series.
>
> Would you rather this be based on 6.12-rc1, or on the current
> mm-nonmm-unstable branch, which has a couple of test changes already?

The latter would be convenient, thanks.