linux-kernel - Re: linux-next: manual merge of the akpm-current tree with the arm64 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <20180924093204.GB52978@arrakis.emea.arm.com>
Date:   Mon, 24 Sep 2018 10:32:05 +0100
From:   Catalin Marinas <catalin.marinas@....com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Andrew Morton <akpm@...ux-foundation.org>,
        Will Deacon <will.deacon@....com>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Jia He <jia.he@...-semitech.com>,
        James Morse <james.morse@....com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the arm64
 tree

Hi Stephen,

On Mon, Sep 24, 2018 at 02:38:53PM +1000, Stephen Rothwell wrote:
> diff --cc arch/arm64/Kconfig
> index da5e6f085561,f8a618a292f4..000000000000
> --- a/arch/arm64/Kconfig
> +++ b/arch/arm64/Kconfig
> @@@ -785,7 -786,8 +785,8 @@@ config ARCH_FLATMEM_ENABL
>   	def_bool !NUMA
>   
>   config HAVE_ARCH_PFN_VALID
>  -	def_bool ARCH_HAS_HOLES_MEMORYMODEL || !SPARSEMEM
>  +	def_bool y
> + 	select HAVE_MEMBLOCK_PFN_VALID

It looks fine. Thanks.

-- 
Catalin