From patchwork Tue Jul 2 23:48:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1955767 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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.a=rsa-sha256 header.s=201702 header.b=rvv9Bb6N; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=patchwork.ozlabs.org) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WDKPq4MGxz1xqh for ; Wed, 3 Jul 2024 09:49:18 +1000 (AEST) Authentication-Results: lists.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.a=rsa-sha256 header.s=201702 header.b=rvv9Bb6N; dkim-atps=neutral Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4WDKPn0fgHz30St for ; Wed, 3 Jul 2024 09:49:17 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; dmarc=pass (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=rvv9Bb6N; dkim-atps=neutral Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) (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 4WDKPR3TWqz2ysd for ; Wed, 3 Jul 2024 09:48:59 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1719964139; bh=BlKZZNRlG1lecOtIMyzas1Jhys8I6pZW+xDbV4ff3ls=; h=Date:From:To:Cc:Subject:From; b=rvv9Bb6NOLbTUAW9xNx7qWEJiFt5iVcg+6gk1Cgq8jpGE/OaD/wExANVbrFdU2McA 1NYC+S3RHGvSfEvK98JQ5cQDKEnYeSRibqzRqB++52Aw2FFT5DD5QMg6CRVB+tqI7I acgvhOIx4GGQk2UlwBVxBFCjBLeouXUBXoP3fH7mTYxuAm+TUH5jUPLxubT8vMWeSM om4cG6ewQZstz/AeFuIW1ehZxqMx0mKjcR7lgYWO4G/6W9DJLsj0Tb26JjximXu1TU nmSvSInsvMJnJ8DO3JbGeccB/9SOQM52Rg4KMXj8h+n3I4H3f4dTJMQIEJgxq0ZjRc 9sLPIZrP7oPHA== 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 4WDKPQ17y1z4wc1; Wed, 3 Jul 2024 09:48:58 +1000 (AEST) Date: Wed, 3 Jul 2024 09:48:57 +1000 From: Stephen Rothwell To: Michael Ellerman , PowerPC , Andrew Morton Subject: linux-next: manual merge of the powerpc tree with the mm tree Message-ID: <20240703094857.3f489d4f@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: Linux Next Mailing List , Linux Kernel Mailing List , Christophe Leroy Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Hi all, Today's linux-next merge of the powerpc tree got a conflict in: arch/powerpc/mm/nohash/Makefile between commit: 9e49846e4d65 ("powerpc/64e: split out nohash Book3E 64-bit code") from the mm-unstable branch of the mm tree and commit: 732b32daef80 ("powerpc: Remove core support for 40x") from the powerpc 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/mm/nohash/Makefile index 90e846f0c46c,86d0fe434824..000000000000 --- a/arch/powerpc/mm/nohash/Makefile