From: Hugh Dickins <hughd@google•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, LKML <linux-kernel@vger•kernel.org>,
Andrew Morton <akpm@linux-foundation•org>,
Mel Gorman <mel@csn•ul.ie>, Mel Gorman <mgorman@suse•de>,
Konstantin Khlebnikov <khlebnikov@openvz•org>
Subject: linux-next: Tree for Mar 23: doubled patch in vmscan.c
Date: Fri, 23 Mar 2012 03:29:26 -0700 (PDT) [thread overview]
Message-ID: <alpine.LSU.2.00.1203230303260.31362@eggly.anvils> (raw)
In-Reply-To: <20120323172333.9af9b678fcde0e6e75b5f6dd@canb.auug.org.au>
On Fri, 23 Mar 2012, Stephen Rothwell wrote:
>
> Changes since 20120322:
>
> The akpm tree lost lots of patches that turned up elsewhere (mostly in
> Linus' tree).
I'm amused to notice that your merging process is as impatient as akpm,
and just cannot wait for Mel to remove lumpy reclaim from mm/vmscan.c.
It has chosen to do so itself, by duplicating Konstantin's "mm: forbid
lumpy-reclaim in shrink_active_list()" (we had expected that to be held
back, but it's gone in anyway, oh well) into shrink_inactive_list(),
overriding the set_reclaim_mode() a few lines above with a spurious
reset_reclaim_mode(sc).
I expect that will sort itself out automatically once you get an update
from akpm, but something to beware of meanwhile (probably just a matter
of deleting Konstantin's patch from your trove now it's in Linus's tree).
Corrective patch below for illustration, but would need to be applied
with care: I wouldn't be surprised if it chose to do exactly the wrong
thing when applied automatically.
Hugh
--- linux-next/mm/vmscan.c.orig 2012-03-23 01:29:33.312011679 -0700
+++ linux-next/mm/vmscan.c 2012-03-23 03:00:08.688142469 -0700
@@ -1528,8 +1528,6 @@ shrink_inactive_list(unsigned long nr_to
lru_add_drain();
- reset_reclaim_mode(sc);
-
if (!sc->may_unmap)
isolate_mode |= ISOLATE_UNMAPPED;
if (!sc->may_writepage)
next prev parent reply other threads:[~2012-03-23 10:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-23 6:23 linux-next: Tree for Mar 23 Stephen Rothwell
2012-03-23 10:29 ` Hugh Dickins [this message]
2012-03-23 12:50 ` linux-next: Tree for Mar 23: doubled patch in vmscan.c Stephen Rothwell
2012-03-23 17:30 ` linux-next: Tree for Mar 23 (xen-acpi) Randy Dunlap
2012-03-24 12:53 ` Konrad Rzeszutek Wilk
2012-03-24 13:22 ` Konrad Rzeszutek Wilk
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=alpine.LSU.2.00.1203230303260.31362@eggly.anvils \
--to=hughd@google$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=khlebnikov@openvz$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mel@csn$(echo .)ul.ie \
--cc=mgorman@suse$(echo .)de \
--cc=sfr@canb$(echo .)auug.org.au \
/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