[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20240212141449.a72329a7ea28fd9ff828d1eb@linux-foundation.org>
Date: Mon, 12 Feb 2024 14:14:49 -0800
From: Andrew Morton <akpm@...ux-foundation.org>
To: SeongJae Park <sj@...nel.org>
Cc: Javier Carrasco <javier.carrasco.cruz@...il.com>, Shuah Khan
<shuah@...nel.org>, Bernd Edlinger <bernd.edlinger@...mail.de>,
linux-kselftest@...r.kernel.org, linux-kernel@...r.kernel.org,
damon@...ts.linux.dev, linux-mm@...ck.org
Subject: Re: [PATCH v2 4/4] selftests: damon: add access_memory to
.gitignore
On Mon, 12 Feb 2024 12:23:56 -0800 SeongJae Park <sj@...nel.org> wrote:
> >
> > > Also, note that this conflicts on mm-unstable.
> >
> > Should I use mm-unstable as basis to make sure no conflicts are introduced?
>
> DAMON selftest patches could be merged in mm-unstable or linux-kselftest
> depending on cases.
>
> If you rebase this on mm-unstable, it might conflict on linux-kselftest.
> Letting Shuah merge this on linux-kselftest and asking Linus Torvalds to fix
> the conflict in next merge window could be one possible option.
>
> Or, making this split out of this series, rebase on mm-unstable, and asking
> Andrew Morton to carry may be another option.
>
> Andrew and Shuah, may I ask your opinions?
I'd say base it on mm-unstable so we don't have conflicts for people to
deal with?
Powered by blists - more mailing lists