linux-kernel - Re: linux-next: manual merge of the akpm-current tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Mon, 24 Apr 2017 10:11:44 +0100
From:   Mel Gorman <mgorman@...hsingularity.net>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Andrew Morton <akpm@...ux-foundation.org>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Johannes Weiner <hannes@...xchg.org>,
        Jesper Dangaard Brouer <brouer@...hat.com>
Subject: Re: linux-next: manual merge of the akpm-current tree with Linus'
 tree

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