From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6CC88C3F2D1 for ; Thu, 5 Mar 2020 05:50:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 36A76208C3 for ; Thu, 5 Mar 2020 05:50:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="FetoxYDy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725955AbgCEFuu (ORCPT ); Thu, 5 Mar 2020 00:50:50 -0500 Received: from bilbo.ozlabs.org ([203.11.71.1]:41845 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725866AbgCEFuu (ORCPT ); Thu, 5 Mar 2020 00:50:50 -0500 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 48Y0Gc0zV8z9sQx; Thu, 5 Mar 2020 16:50:47 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1583387448; bh=HIjreBzySCUIEeSuzsf//lPHRyDfWa5LHfVrm9KtDe4=; h=Date:From:To:Cc:Subject:From; b=FetoxYDyI8llhhNu/cO6NFR/xmg8Nx71iNmUUZGG2pUhTGqMq/N/P46dsEAJbdOp6 e4He9ia3XUEQSMhxPOsEVYQvcDqh5B5k+D/TXrnrlDNHF1UTOq+ae68TBcSCGhMi1W ggnQV/ZK/JyqD6EDcFEuaEDwZbgvYxc2YAZqlEKJO39SFLQaqWlFbMdhcMcg5YudiI eMMepFyA/sXmB6j9rdWLm0ouB1M4hLM5Tdn90mF18yYlN9Y+sid7zXzB0v4AYD8Wl3 Vy1PQo7I3tQ/pZf9uUE9uRREJXTG0YJr4nAZkv+yW6rFXjucHdIJd6IddSAN9TX310 jzsTkoLtc95vQ== Date: Thu, 5 Mar 2020 16:50:46 +1100 From: Stephen Rothwell To: Andrew Morton , Catalin Marinas , Will Deacon Cc: Linux Next Mailing List , Linux Kernel Mailing List , Anshuman Khandual , Mike Rapoport Subject: linux-next: manual merge of the akpm tree with the arm64 tree Message-ID: <20200305165046.42e62969@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/y0C2FS1i35Qy6f.w0Srhio3"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/y0C2FS1i35Qy6f.w0Srhio3 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the akpm tree got a conflict in: arch/arm64/mm/mmu.c between commit: bbd6ec605c0f ("arm64/mm: Enable memory hot remove") from the arm64 tree and patch: 37be0f08b1cc ("arm64/mm: implement unmap_hotplug_p4d_range") from the akpm tree. I fixed it up (I just dropped the latter (and its followup fix) for today) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. --=20 Cheers, Stephen Rothwell --Sig_/y0C2FS1i35Qy6f.w0Srhio3 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl5gkzYACgkQAVBC80lX 0Gxg0wgAm8DDZt6CLQjeJJbqvceZ1BDeCuM+74tqQx2JzHgmTgJimDgXQdOnhIRO huNUayfzgSmE8XK0waaj2M9tfhJZpqKOwt2zh1xFud1/ahkBOhpv9j7Q0MBA7QTY SFD7CsSiUeKHQv1a57N82ikPSUUrG9QmbE9EydTu3meJU6nRHUR9hAHP70I3fETY DiXxaLJEsgdkMPrMgMYUSAElSFvUxDXhb8Uvml9hlHixacXagJSI+XbKn2UaQFpH w/1WdSrrc51p53JZ0g1eRGjY5D1Tvsek1yU2Q9Qsp4ubPOldZUEfP5B4QO1R4Eer 1IZnrwG28U9aCV3mFkYhjerYfa4LSA== =OWEV -----END PGP SIGNATURE----- --Sig_/y0C2FS1i35Qy6f.w0Srhio3--