From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1167656AbdDXJLz (ORCPT ); Mon, 24 Apr 2017 05:11:55 -0400 Received: from outbound-smtp05.blacknight.com ([81.17.249.38]:51419 "EHLO outbound-smtp05.blacknight.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1167627AbdDXJLq (ORCPT ); Mon, 24 Apr 2017 05:11:46 -0400 Date: Mon, 24 Apr 2017 10:11:44 +0100 From: Mel Gorman To: Stephen Rothwell Cc: Andrew Morton , Linux-Next Mailing List , Linux Kernel Mailing List , Johannes Weiner , Jesper Dangaard Brouer Subject: Re: linux-next: manual merge of the akpm-current tree with Linus' tree Message-ID: <20170424091144.63pkjdzgzbmsze6r@techsingularity.net> References: <20170424172502.63b2c26b@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: <20170424172502.63b2c26b@canb.auug.org.au> User-Agent: Mutt/1.6.2 (2016-07-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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