From: Andrew Morton <akpm@linux-foundation•org>
To: Muchun Song <songmuchun@bytedance•com>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Matthew Wilcox <willy@infradead•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the mm tree with the folio tree
Date: Wed, 22 Jun 2022 11:59:17 -0700 [thread overview]
Message-ID: <20220622115917.5268aeea70b22a566c90be8c@linux-foundation.org> (raw)
In-Reply-To: <CAMZfGtVQr=7pUevVbbNK9teskfGsjcoif2sfHQ-YrDx5qHNiXg@mail.gmail.com>
On Wed, 22 Jun 2022 15:22:35 +0800 Muchun Song <songmuchun@bytedance•com> wrote:
> > Today's linux-next merge of the mm tree got a conflict in:
> >
> > mm/vmscan.c
> >
> > between commit:
> >
> > 15077be8badc ("vmscan: Add check_move_unevictable_folios()")
>
> Sorry for the conflicts, I didn't see this change in the mm-unstable branch
> yesterday. Based on this commit, I have reworked the following commit
> (see attachment, mainly changes are about check_move_unevictable_folios()).
> Andrew can pick it up if he wants to replace the original patch with
> the new one.
Your comments in
https://lkml.kernel.org/r/YrM2XCwzu65cb81r@FVFYT0MHHV2J.googleapis.com
make me wonder whether simply dropping cca700a8e695 ("mm: lru: use
lruvec lock to serialize memcg changes") would be best?
next prev parent reply other threads:[~2022-06-22 18:59 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-22 5:38 linux-next: manual merge of the mm tree with the folio tree Stephen Rothwell
2022-06-22 7:22 ` Muchun Song
2022-06-22 18:59 ` Andrew Morton [this message]
2022-06-23 2:15 ` Muchun Song
-- strict thread matches above, loose matches on Subject: below --
2022-06-20 3:53 Stephen Rothwell
2022-05-12 8:26 Stephen Rothwell
2022-05-12 11:52 ` Ryusuke Konishi
2022-05-12 12:51 ` Matthew Wilcox
2022-05-12 16:13 ` Ryusuke Konishi
2022-05-03 6:14 Stephen Rothwell
2022-05-02 9:36 Stephen Rothwell
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=20220622115917.5268aeea70b22a566c90be8c@linux-foundation.org \
--to=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=songmuchun@bytedance$(echo .)com \
--cc=willy@infradead$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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