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 89EFBC4360D for ; Wed, 25 Sep 2019 17:14:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 62AE72146E for ; Wed, 25 Sep 2019 17:14:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569431699; bh=89gdrktY78IgBMDt3Gfn54he9idV2JCVN2ModkkNem8=; h=Date:From:To:Cc:Subject:List-ID:From; b=dGJAx1yqnMnGRGI8bazAuy08Rr1QcoMIQILcCSZacvrXJSrksGjBSigHMWUhYfUVj 8Gn59+eMjw7kocpnH3Nv1TTK0adl+57ihU5KDTk5cuvxhDpBQuiogtoQCTve9Nqlcz jAc7eDCF9EFdv6iQ5Blwi4aOmqho20ug/I9/29OI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2502235AbfIYRO6 (ORCPT ); Wed, 25 Sep 2019 13:14:58 -0400 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:53976 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726200AbfIYRO6 (ORCPT ); Wed, 25 Sep 2019 13:14:58 -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=aLQzNm39tdIMTQRnIptN+pzSYiE/srlJQZjWMcvGrPc=; b=vIRk7UL9EyuwGru+KShQfdlrX 1SilWNO9Nh+evGCOaUaZNXyXXVz8E9diVHiYEX4kTwWkhyazb3ycaLvYxx6fWgy4hIV4EFbgrxnb9 p7x0RK3wnE5UftcSnfEDz+HhqT7F39Ftd5z7NCCf2nwYCU3G/Dvs/sVqrDa9AAK7LF1TE=; Received: from [12.157.10.118] (helo=fitzroy.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 1iDAsQ-000812-IP; Wed, 25 Sep 2019 17:14:54 +0000 Received: by fitzroy.sirena.org.uk (Postfix, from userid 1000) id 03BCAD01D66; Wed, 25 Sep 2019 18:14:53 +0100 (BST) Date: Wed, 25 Sep 2019 10:14:52 -0700 From: Mark Brown To: Mike Rapoport , Palmer Dabbelt , Paul Walmsley Cc: Linux Next Mailing List , Linux Kernel Mailing List Subject: linux-next: manual merge of the risc-v-fixes tree with Linus' tree Message-ID: <20190925171452.GK2036@sirena.org.uk> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="mEgWsss+US7fWyVR" Content-Disposition: inline X-Cookie: Be careful! UGLY strikes 9 out of 10! 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 --mEgWsss+US7fWyVR Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the risc-v-fixes tree got a conflict in: arch/riscv/include/asm/pgtable.h between commit: 782de70c42930ba ("mm: consolidate pgtable_cache_init() and pgd_cache_init= ()") =66rom Linus' tree and commit: b6f2b2e600a27b7 ("RISC-V: Fix building error when CONFIG_SPARSEMEM_MANUAL= =3Dy") =66rom the risc-v-fixes 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 c60123f018f50,4f4162d90586d..0000000000000 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@@ -424,18 -436,11 +436,6 @@@ extern void *dtb_early_va extern void setup_bootmem(void); extern void paging_init(void); =20 - #define VMALLOC_SIZE (KERN_VIRT_SIZE >> 1) - #define VMALLOC_END (PAGE_OFFSET - 1) - #define VMALLOC_START (PAGE_OFFSET - VMALLOC_SIZE) -=20 - #define FIXADDR_TOP VMALLOC_START - #ifdef CONFIG_64BIT - #define FIXADDR_SIZE PMD_SIZE - #else - #define FIXADDR_SIZE PGDIR_SIZE - #endif - #define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE) -static inline void pgtable_cache_init(void) -{ - /* No page table caches to initialize */ -} -- /* * Task size is 0x4000000000 for RV64 or 0x9fc00000 for RV32. * Note that PGDIR_SIZE must evenly divide TASK_SIZE. --mEgWsss+US7fWyVR Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAl2LoIwACgkQJNaLcl1U h9Ap6Qf8DT2faMTcscCRsAs0NR57fTzrUkbKVVZkwGSjhZAgaZ3cFeHpVYqlloZg X9KOdOG2JhrlvrYmEoyX9aKh4/c3GLs25PC3FidQG6RULOasgJvJYaO8/UDct6iz MEilerQKUPLlye3fyOAz45hhmDe80CLCpVFKlXHZGOilpBTrl4jfBeMEWEU24LPh wkLXsv4keO2e40Krgex05d7GztnQQIWLpZXlUfZmVv+2Bx6N2hLtsUfiDOLGz0hJ fk3CodIheoNwtIB1JARf4wvn0KsYp6krXLM+Wsd0x55jvC120BVRsxl8YknDW4LM ux/jkLDUkjij8WhzclqD9uvEuzlBjg== =EJ+I -----END PGP SIGNATURE----- --mEgWsss+US7fWyVR--