Received-SPF: pass (google.com: domain of linux-kernel+bounces-62465-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Date: Mon, 12 Feb 2024 14:14:49 -0800
From: Andrew Morton <akpm@linux-foundation.org>
To: SeongJae Park <sj@kernel.org>
Cc: Javier Carrasco <javier.carrasco.cruz@gmail.com>, Shuah Khan
 <shuah@kernel.org>, Bernd Edlinger <bernd.edlinger@hotmail.de>,
 linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org,
 damon@lists.linux.dev, linux-mm@kvack.org
Subject: Re: [PATCH v2 4/4] selftests: damon: add access_memory to
 .gitignore
Message-Id: <20240212141449.a72329a7ea28fd9ff828d1eb@linux-foundation.org>
In-Reply-To: <20240212202356.73461-1-sj@kernel.org>
References: <34986860-41e5-4d03-a0c5-72af12e7e97c@gmail.com>
	<20240212202356.73461-1-sj@kernel.org>
Precedence: bulk
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

On Mon, 12 Feb 2024 12:23:56 -0800 SeongJae Park <sj@kernel.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?