From patchwork Mon Oct 3 22:16:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1685719 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=112.213.38.117; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) 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=HZa29eeG; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MhFY633pVz1yqn for ; Tue, 4 Oct 2022 09:16:26 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4MhFY60HB4z3cdY for ; Tue, 4 Oct 2022 09:16:26 +1100 (AEDT) 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=HZa29eeG; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from gandalf.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) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4MhFXm3xnFz2xrk for ; Tue, 4 Oct 2022 09:16:08 +1100 (AEDT) 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=HZa29eeG; 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 4MhFXm2JWFz4xGd; Tue, 4 Oct 2022 09:16:08 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1664835368; bh=/ywn/hJ/rhTn2xvBQYEHB9QtHev1+jTnleFfK94jVz0=; h=Date:From:To:Cc:Subject:From; b=HZa29eeGup4/9cpjWUxrvUoxeahZgkZrk/zR4ACYDDP2vjPucOseIaUZi/Tjij/10 z6pWIg24yMJb6S6gHVDS8wgKq4hr7XdbwiVin/Vhb3mZ2qndcoIKBDAvzr0hy1qZE+ X1fMVeyVokgUfnFlei5pAl431oKJNpbiXYV1JT3/BzCB1nstpLFbjbLLb4/vxlWOFc JTMH05uPwLxs5LHkCOo/daV5hsj9WWX4KWT+6qWHFj1thUZa3+VSzsRpx1n1cX+IKn sxgAj0hM5+3TkqvpYPBNLa63e14Av9c8zew0fkm+VvaoA5iN7+KiN+gNYrxmnWZ8TS +lYic6ne/3LHg== Date: Tue, 4 Oct 2022 09:16:06 +1100 From: Stephen Rothwell To: Michael Ellerman , PowerPC , Masahiro Yamada Subject: linux-next: manual merge of the powerpc tree with the kbuild tree Message-ID: <20221004091606.71418ddc@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 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/Makefile between commit: ce697ccee1a8 ("kbuild: remove head-y syntax") from the kbuild tree and commit: dfc3095cec27 ("powerpc: Remove CONFIG_FSL_BOOKE") from the powerpc tree. I fixed it up (I used the former version of this file and added the following merge fix patch) 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. From: Stephen Rothwell Date: Tue, 4 Oct 2022 09:13:46 +1100 Subject: [PATCH] powerpc: fix up for "kbuild: remove head-y syntax" Signed-off-by: Stephen Rothwell --- scripts/head-object-list.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/head-object-list.txt b/scripts/head-object-list.txt index dd2ba2eda636..e8219d65c3b7 100644 --- a/scripts/head-object-list.txt +++ b/scripts/head-object-list.txt @@ -34,7 +34,7 @@ arch/powerpc/kernel/head_44x.o arch/powerpc/kernel/head_64.o arch/powerpc/kernel/head_8xx.o arch/powerpc/kernel/head_book3s_32.o -arch/powerpc/kernel/head_fsl_booke.o +arch/powerpc/kernel/head_85xx.o arch/powerpc/kernel/entry_64.o arch/powerpc/kernel/fpu.o arch/powerpc/kernel/vector.o