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 Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 066DFC2BD09 for ; Wed, 3 Jul 2024 12:15:47 +0000 (UTC) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ellerman.id.au header.i=@ellerman.id.au header.a=rsa-sha256 header.s=201909 header.b=sD3GuhqY; dkim-atps=neutral Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4WDdz54zDqz3dHP for ; Wed, 3 Jul 2024 22:15:45 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=ellerman.id.au Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ellerman.id.au header.i=@ellerman.id.au header.a=rsa-sha256 header.s=201909 header.b=sD3GuhqY; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4WDdyK2rgKz3brC for ; Wed, 3 Jul 2024 22:15:05 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ellerman.id.au; s=201909; t=1720008905; bh=UxJxwgl5X9xFRRy727u0o88lwP6DZx5C/R3IDsogaPQ=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=sD3GuhqYaStocDQF9XC/h/JF8I8fEfGUPye1q2o6ONwncol7PYAQP84mm7e+D2iWX 3DBH4gywHI7nZ2bHBrpxQHEdgVmo6P0lCi2jsjpg/2FwV/LnrBfkx6dGzhRFZgQ35e 2WgxxuQtIxEdY1KNqBJoMFuInL2GwAM7pEfKHMYmptNV0WHhJ7YlGnC9TEAKDjFsPk 3wlyCiIt3pKGb8zdSYrBp8vtUMDgmbvMGsH5vaiShLGDmYvztE5VM6p+noSd3nd88P ZP5/E/of1VOOMWxd5xhG4rmLgJ+L3nfZ/blIxJmX09euQ2o+tPkl3RUBFRhfsgcrGN myKpyZJVVEl0Q== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4WDdyK0qQFz4w2Q; Wed, 3 Jul 2024 22:15:05 +1000 (AEST) From: Michael Ellerman To: Stephen Rothwell , PowerPC , Andrew Morton Subject: Re: linux-next: manual merge of the powerpc tree with the mm tree In-Reply-To: <20240703094857.3f489d4f@canb.auug.org.au> References: <20240703094857.3f489d4f@canb.auug.org.au> Date: Wed, 03 Jul 2024 22:15:04 +1000 Message-ID: <87cynuk6yf.fsf@mail.lhotse> MIME-Version: 1.0 Content-Type: text/plain 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 , Christophe Leroy Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" Stephen Rothwell writes: > Hi all, > > Today's linux-next merge of the powerpc tree got a conflict in: > > arch/powerpc/mm/nohash/Makefile > ... > diff --cc arch/powerpc/mm/nohash/Makefile > index 90e846f0c46c,86d0fe434824..000000000000 > --- a/arch/powerpc/mm/nohash/Makefile > +++ b/arch/powerpc/mm/nohash/Makefile > @@@ -1,8 -1,7 +1,7 @@@ > # SPDX-License-Identifier: GPL-2.0 > > obj-y += mmu_context.o tlb.o tlb_low.o kup.o > -obj-$(CONFIG_PPC_BOOK3E_64) += tlb_low_64e.o book3e_pgtable.o > +obj-$(CONFIG_PPC_BOOK3E_64) += tlb_64e.o tlb_low_64e.o book3e_pgtable.o > - obj-$(CONFIG_40x) += 40x.o > obj-$(CONFIG_44x) += 44x.o > obj-$(CONFIG_PPC_8xx) += 8xx.o > obj-$(CONFIG_PPC_E500) += e500.o Thanks, looks right. cheers