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.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, 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 9E2B1C433DF for ; Wed, 3 Jun 2020 08:52:34 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 003EA20678 for ; Wed, 3 Jun 2020 08:52:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="SD2VzNB8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 003EA20678 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 49cN2l5MgXzDqX6 for ; Wed, 3 Jun 2020 18:52:31 +1000 (AEST) Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 49cN0d003dzDqQW for ; Wed, 3 Jun 2020 18:50:40 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.a=rsa-sha256 header.s=201702 header.b=SD2VzNB8; dkim-atps=neutral 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 49cN0b5HQQz9sTF; Wed, 3 Jun 2020 18:50:39 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1591174240; bh=ypxXuxhmE/IJfGvEhAB6ejWn+h+LQ7qlNA/n52FNwPs=; h=Date:From:To:Cc:Subject:From; b=SD2VzNB8KrC0CfXvNG4YOsVYJojB3OEDVQ4Nnq9J6qqLKn24jPtP3HukEPx0f0dbU ixL3ftvJ/uWW0bs5gGQyRDmRzy53FbsxP/d/t0wRTJOd7D4l+roJR82jdFG6XaoBuV hL3GEJj7DyMkYFxwCcuwX+Gtt/NWFf9Pr4ORxnJVmWV3G3W5Q1JbIrCseOPLRJNQF1 KyUVGkGsaB2pACrV377H8qW+1y76oBRyktpzPGRi1y5h6Vo6Y8+rQK402dkvAJs82X QKBn9T56tQRh7sV/EjAWUM4nZyBy6ZVXS1DHT7ZoB7lu6yBE8l0Kh88s8Fa/cGK//t ro+Hs9MNVr9zQ== Date: Wed, 3 Jun 2020 18:50:38 +1000 From: Stephen Rothwell To: Andrew Morton , Michael Ellerman , PowerPC Subject: linux-next: manual merge of the akpm-current tree with the powerpc tree Message-ID: <20200603185038.296b18ae@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/JVpjBD/_51l/pxzhVpktdsH"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux Next Mailing List , Linux Kernel Mailing List , Mike Rapoport Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" --Sig_/JVpjBD/_51l/pxzhVpktdsH Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: arch/powerpc/mm/ptdump/ptdump.c between commit: 6b789a26d7da ("powerpc/ptdump: Handle hugepd at PGD level") from the powerpc tree and patch: "powerpc: add support for folded p4d page tables" from the akpm-current tree. Thanks to Michael Ellerman for an example resolution. 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. --=20 Cheers, Stephen Rothwell diff --cc arch/powerpc/mm/ptdump/ptdump.c index 5fc880e30175,507cb9793b26..000000000000 --- a/arch/powerpc/mm/ptdump/ptdump.c +++ b/arch/powerpc/mm/ptdump/ptdump.c @@@ -333,13 -304,13 +333,15 @@@ static void walk_pagetables(struct pg_s * the hash pagetable. */ for (i =3D pgd_index(addr); i < PTRS_PER_PGD; i++, pgd++, addr +=3D PGDI= R_SIZE) { - if (pgd_none(*pgd) || pgd_is_leaf(*pgd)) - note_page(st, addr, 1, pgd_val(*pgd), PGDIR_SIZE); - else if (is_hugepd(__hugepd(pgd_val(*pgd)))) - walk_hugepd(st, (hugepd_t *)pgd, addr, PGDIR_SHIFT, 1); + p4d_t *p4d =3D p4d_offset(pgd, 0); +=20 - if (!p4d_none(*p4d) && !p4d_is_leaf(*p4d)) ++ if (p4d_none(*p4d) || p4d_is_leaf(*p4d)) ++ note_page(st, addr, 1, p4d_val(*p4d), PGDIR_SIZE); ++ else if (is_hugepd(__hugepd(p4d_val(*p4d)))) ++ walk_hugepd(st, (hugepd_t *)p4d, addr, PGDIR_SHIFT, 1); + else - /* pgd exists */ - walk_pud(st, pgd, addr); + /* p4d exists */ + walk_pud(st, p4d, addr); - else - note_page(st, addr, 1, p4d_val(*p4d)); } } =20 --Sig_/JVpjBD/_51l/pxzhVpktdsH Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl7XZF4ACgkQAVBC80lX 0Gzzqgf/aKsN72wqrZdqkF7zpAyZv0PGdINzp+V3ZgAyHyeGIafRw4B8B1bIFQ9x OBnuT5uHRw3UNNCXQW6zA86kbmMnPNWjKl6sUb4WrOptUrgU56zJPsFdnKmLvNWt AHnciEHVeSzaT+cdv1i8aYi2KytbtaW7XXzJjRgzxEvLBW53cFzTXtTlgJ623klH l8u7kg2tdxFuxBGHQnKu7t0n67vZNJVlfyYoVvK5HaacRZyFAZYB8dwSddSNSjAn EHr0THyMoCKkjcCDPSCsHb7bHSuuUTDExO/hL7terST2EgzXJEbq0fsii08syF+c YyH8kx78oLG9wwFeih2FjUuAYgQP8w== =AbW2 -----END PGP SIGNATURE----- --Sig_/JVpjBD/_51l/pxzhVpktdsH--