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
Date: Mon, 12 Feb 2024 14:14:49 -0800 [thread overview]
Message-ID: <20240212141449.a72329a7ea28fd9ff828d1eb@linux-foundation.org> (raw)
In-Reply-To: <20240212202356.73461-1-sj@kernel.org>
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?
prev parent reply other threads:[~2024-02-12 22:14 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20240212-selftest_gitignore-v2-4-75f0de50a178@gmail.com>
2024-02-12 19:53 ` SeongJae Park
2024-02-12 20:07 ` Javier Carrasco
2024-02-12 20:23 ` SeongJae Park
2024-02-12 22:14 ` Andrew Morton [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240212141449.a72329a7ea28fd9ff828d1eb@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=bernd.edlinger@hotmail.de \
--cc=damon@lists.linux.dev \
--cc=javier.carrasco.cruz@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=shuah@kernel.org \
--cc=sj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox