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=-2.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 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 54F43C4CEC9 for ; Fri, 20 Sep 2019 15:35:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2A81320882 for ; Fri, 20 Sep 2019 15:35:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568993740; bh=CIydN4PAKILN7RGOWFWgQ6jtHGiUg61gpmNecWOFHkg=; h=Date:From:To:Cc:Subject:List-ID:From; b=dqYZtpzn/yly1/kLYNgYnJ9NKcFJcrq3M0VTj8ynuxq1Gy9vNLhHJ2sbwsIUrIE8O bAA/4QCsU/u93HN+KbY3gNMtHymad2wEUqE/1lSC0Fq3QlpEkjOW3bxGERkaetqNCU Upsqz/LTQrVVf87dQi2whTBVDl2FdQ7sX7ibky1I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404125AbfITPfj (ORCPT ); Fri, 20 Sep 2019 11:35:39 -0400 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:39154 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388863AbfITPfj (ORCPT ); Fri, 20 Sep 2019 11:35:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Content-Type:MIME-Version: Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=jv6jwZLjeneciY2Go2v67af3R12NQ37nUpqtm2+kHRM=; b=dmaT+BytqE1t23KxTkYNziZ/Y 3xjHWp/RdLqFG11O/LTqk54oLdHl1uGUY9p3q5X5jXMvcqJSDDbwVtK9YRyN/cJ3A7zLpWVdADvfF 9pzkIpbaqqldFhtglrfAVgHPyjMA7vf2+i4Yc/OiydVfmniS5Rtbuh6uEGGtBhVb5FHqc=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=ypsilon.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1iBKwZ-0002mq-TN; Fri, 20 Sep 2019 15:35:35 +0000 Received: by ypsilon.sirena.org.uk (Postfix, from userid 1000) id 205AB274293F; Fri, 20 Sep 2019 16:35:35 +0100 (BST) Date: Fri, 20 Sep 2019 16:35:35 +0100 From: Mark Brown To: Andrew Morton , Mike Rapoport , Greentime Hu , Paul Walmsley Cc: Linux Next Mailing List , Linux Kernel Mailing List Subject: linux-next: manual merge of the akpm-current tree with the risc-v-fixes tree Message-ID: <20190920153535.GG3822@sirena.co.uk> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="lHGcFxmlz1yfXmOs" Content-Disposition: inline X-Cookie: Stay away from hurricanes for a while. User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --lHGcFxmlz1yfXmOs Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: arch/riscv/include/asm/pgtable.h between commit: b6f2b2e600a27b798 ("RISC-V: Fix building error when CONFIG_SPARSEMEM_MANU= AL=3Dy") =66rom the risc-v-fixes tree and commit: e10b0ff68eee9f59 ("mm: consolidate pgtable_cache_init() and pgd_cache_in= it()") =66rom the akpm-current tree. I fixed it up (see below) 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. diff --cc arch/riscv/include/asm/pgtable.h index 1be4f70ab2660,f45f6fbd2a50d..0000000000000 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@@ -439,13 -411,12 +439,8 @@@ extern void *dtb_early_va extern void setup_bootmem(void); extern void paging_init(void); =20 - static inline void pgtable_cache_init(void) - { - /* No page table caches to initialize */ - } -#define VMALLOC_SIZE (KERN_VIRT_SIZE >> 1) -#define VMALLOC_END (PAGE_OFFSET - 1) -#define VMALLOC_START (PAGE_OFFSET - VMALLOC_SIZE) -- /* - * Task size is 0x4000000000 for RV64 or 0xb800000 for RV32. + * Task size is 0x4000000000 for RV64 or 0x9fc00000 for RV32. * Note that PGDIR_SIZE must evenly divide TASK_SIZE. */ #ifdef CONFIG_64BIT --lHGcFxmlz1yfXmOs Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAl2E8cYACgkQJNaLcl1U h9DwIgf/Yk/LkPBeRdpiRkluEKMxHCUj7c3Yr2rXQ6eqPFnLMKhUx6ljfSgc7pHZ 1AD7RXPDvJO3Yq291egkMnWM+MgxTz1fkQCQRSaCduxRogfXXrxEPAC8zwRQoaHC WfpUgPDVctUf/W4+QIC4fwGLwdnyFbfMgoaLUwQ+PAw+l5A8utf+6qMKKMtwdgmi 1sDKE9V/K3cPxI2vv1psFCLjXYagUhSX8PE8So+VAs61w3j531zjfDY0Z3KageHt tsFibX58ZWUWfxkXaAZsyggEsafErf2y1CLU+vUHT0KnMldsFrdVdy0DuPXP75f/ JixbyJTuVwYj4FQPFFShMrIxsaGKMw== =Gg5i -----END PGP SIGNATURE----- --lHGcFxmlz1yfXmOs--