From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932878AbdDGJ0K (ORCPT ); Fri, 7 Apr 2017 05:26:10 -0400 Received: from ozlabs.org ([103.22.144.67]:50323 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932555AbdDGJ0A (ORCPT ); Fri, 7 Apr 2017 05:26:00 -0400 Date: Fri, 7 Apr 2017 19:25:54 +1000 From: Stephen Rothwell To: Catalin Marinas Cc: Andrew Morton , Linux-Next Mailing List , Linux Kernel Mailing List , AKASHI Takahiro , Laura Abbott Subject: Re: linux-next: manual merge of the akpm tree with the arm64 tree Message-ID: <20170407192554.5841e181@canb.auug.org.au> In-Reply-To: <20170407084835.GA18291@e104818-lin.cambridge.arm.com> References: <20170407174120.0b0baadf@canb.auug.org.au> <20170407084835.GA18291@e104818-lin.cambridge.arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Catalin, On Fri, 7 Apr 2017 09:48:35 +0100 Catalin Marinas wrote: > > Thanks for fixing this up. Not ideal, indeed, but I can push a clean-up > patch after -rc1 to move set_memory_valid() to an arm64-specific > set_memory.h (which would include asm-generic/set_memory.h). Given that > my for-next branch is based on 4.11-rc3, I can't do this now without > risking breaking other things. Actually, I suspect that the patch in Andrew's series will be updated to do that. This part of Andrew's patch series is applied on top of all the other linux-next trees and is sent to Linus fairly late in the merge window. -- Cheers, Stephen Rothwell