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 9E20BC433F5 for ; Mon, 3 Oct 2022 22:17:02 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4MhFYm5LRZz3c2L for ; Tue, 4 Oct 2022 09:17:00 +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 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 Content-Type: multipart/signed; boundary="Sig_/9HMZ9obeKa+3ea5v+n8bH7G"; 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 Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" --Sig_/9HMZ9obeKa+3ea5v+n8bH7G Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable 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 --=20 2.35.1 --=20 Cheers, Stephen Rothwell --Sig_/9HMZ9obeKa+3ea5v+n8bH7G Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmM7XyYACgkQAVBC80lX 0GzpvQf+P5/iiucN2fRIfc3bLL+7KzxSdMuT1y/bgbpO7Zb2eO1zqdfJiuioOTPm Gv9/OT/3RRZDty764WEwdyvLgnLoz/G2cfQv8kJ9UiR7wq8qVqwpnvedWnfMpIgi Vzobx5AfhtAKR80z/ouKwa8T5GzEOfNkJK0DtAKrSi4NGPYqjcDwTdhJqLP8QxJE eMOROgBNBgsJNJzgx9YhgwX/zBAiU7dIe+RAh1CEbyBEjqM72X34oLlhXQ1Qr6r0 76NJgMJEHztLLNDoGBRRu37qz6ZB+VU/cMBc+c/18lV2B85+Hf+Z8xeayogRqdvX jBAIEBTQ0B8XSUxx1ljyolb3kV+xrA== =qf9g -----END PGP SIGNATURE----- --Sig_/9HMZ9obeKa+3ea5v+n8bH7G--