From patchwork Mon Jul 8 11:43:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1129056 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45j3XS5SJsz9sNT for ; Mon, 8 Jul 2019 21:44:56 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="PNE9fPP4"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 45j3XS3qSYzDqV2 for ; Mon, 8 Jul 2019 21:44:56 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from ozlabs.org (bilbo.ozlabs.org [203.11.71.1]) (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 45j3Vr2X6gzDqRN for ; Mon, 8 Jul 2019 21:43:32 +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.b="PNE9fPP4"; 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 45j3Vp66yHz9sNT; Mon, 8 Jul 2019 21:43:30 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1562586211; bh=fVX79QzuP3XmjxHGLGEV10dVgDN3UaHzkPoTyKKYOcA=; h=Date:From:To:Cc:Subject:From; b=PNE9fPP4AtS+EAZZ57DdHy5A7YADnOLwCPwb62eA6/pj0cH30EhWbzn+VeJHpY0o0 +OPK11rsLVRQhBc4T2CX//KkOibzFzQmJEqEdejdqKop73tMwe59NU0koXI1gfLsRO YtJ4svZ04DY48nIQ76DYBI3mAOj2wwvT0ZNSAU2+2U3a2OOVbvXs9aZpInxTqN2Lon 6k5X5p7/uOaI8oxjwhhQmw6QacI81/wOsT4qxXl26NOIweqy1b/dlCm7+pRQq1maV9 roPT8Wi9a4PbKVJyNy9MrMxHtgb9OZy0c17f3NHG7b+fp2tmW3F7ZPYMmfQJWqysqy htoarpWhoj7JA== Date: Mon, 8 Jul 2019 21:43:28 +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: <20190708214328.6271f3f2@canb.auug.org.au> MIME-Version: 1.0 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: "Aneesh Kumar K.V" , Linux Next Mailing List , Linux Kernel Mailing List Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: arch/powerpc/include/asm/pgtable.h between commit: d6eacedd1f0e ("powerpc/book3s: Use config independent helpers for page table walk") from the powerpc tree and commit: be66a174b253 ("mm/nvdimm: add is_ioremap_addr and use that to check ioremap address") from 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/powerpc/include/asm/pgtable.h index bf7d771f342e,64145751b2fd..000000000000 --- a/arch/powerpc/include/asm/pgtable.h