From: Mel Gorman <mgorman@techsingularity.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Johannes Weiner <hannes@cmpxchg.org>,
Jesper Dangaard Brouer <brouer@redhat.com>
Subject: Re: linux-next: manual merge of the akpm-current tree with Linus' tree
Date: Mon, 24 Apr 2017 10:11:44 +0100 [thread overview]
Message-ID: <20170424091144.63pkjdzgzbmsze6r@techsingularity.net> (raw)
In-Reply-To: <20170424172502.63b2c26b@canb.auug.org.au>
On Mon, Apr 24, 2017 at 05:25:02PM +1000, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> mm/page_alloc.c
>
> between commit:
>
> d34b0733b452 ("Revert "mm, page_alloc: only use per-cpu allocator for irq-safe requests"")
>
> from Linus' tree and commit:
>
> f4881295a79e ("mm, page_alloc: re-enable softirq use of per-cpu page allocator")
> e2f499864da5 ("mm-page_alloc-re-enable-softirq-use-of-per-cpu-page-allocator-checkpatch-fixes")
> 24612e65dd01 ("mm: delete NR_PAGES_SCANNED and pgdat_reclaimable()")
>
> from the akpm-current tree.
>
This should partially be a transient problem. The revert in Linus' tree is
now the primary patch with f4881295a79e and e2f499864da5 going away. Not
sure about 24612e65dd01
--
Mel Gorman
SUSE Labs
next prev parent reply other threads:[~2017-04-24 9:11 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-24 7:25 linux-next: manual merge of the akpm-current tree with Linus' tree Stephen Rothwell
2017-04-24 9:11 ` Mel Gorman [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-04-11 3:35 Stephen Rothwell
2021-04-06 11:29 Stephen Rothwell
2021-02-08 12:10 Stephen Rothwell
2020-09-08 9:24 Stephen Rothwell
2020-09-08 9:17 Stephen Rothwell
2020-06-03 8:07 Stephen Rothwell
2020-06-03 7:53 Stephen Rothwell
2019-02-18 6:51 Stephen Rothwell
2019-02-20 1:00 ` Stephen Rothwell
2019-01-11 2:51 Stephen Rothwell
2019-01-11 15:08 ` Jerome Glisse
2019-01-07 2:16 Stephen Rothwell
2018-08-15 8:05 Stephen Rothwell
2018-07-23 8:00 Stephen Rothwell
2018-06-14 1:43 Stephen Rothwell
2018-06-14 1:36 Stephen Rothwell
2018-03-16 5:56 Stephen Rothwell
2017-11-02 8:10 Stephen Rothwell
2017-11-02 7:37 Stephen Rothwell
2017-05-08 3:48 Stephen Rothwell
2016-12-05 5:38 Stephen Rothwell
2016-12-05 5:56 ` Michal Hocko
2016-12-05 6:08 ` Stephen Rothwell
2016-01-18 3:22 Stephen Rothwell
2015-12-18 5:09 Stephen Rothwell
2015-10-06 5:46 Stephen Rothwell
2015-07-20 3:54 Stephen Rothwell
2015-05-19 6:40 Stephen Rothwell
2014-08-08 5:46 Stephen Rothwell
2014-08-07 6:51 Stephen Rothwell
2014-05-29 9:08 Stephen Rothwell
2014-04-29 4:47 Stephen Rothwell
2014-04-24 5:38 Stephen Rothwell
2014-04-07 4:18 Stephen Rothwell
2014-01-29 3:46 Stephen Rothwell
2013-12-23 3:58 Stephen Rothwell
2013-12-03 1:52 Stephen Rothwell
2013-12-03 7:16 ` Richard Weinberger
2013-12-03 7:31 ` Andrew Morton
2013-12-03 7:36 ` Richard Weinberger
2013-02-02 12:55 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=20170424091144.63pkjdzgzbmsze6r@techsingularity.net \
--to=mgorman@techsingularity.net \
--cc=akpm@linux-foundation.org \
--cc=brouer@redhat.com \
--cc=hannes@cmpxchg.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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;
as well as URLs for NNTP newsgroup(s).