From patchwork Mon Oct 3 22:12:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1685718 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=nEhFnZ4+; 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) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MhFSb4RWtz1yqm for ; Tue, 4 Oct 2022 09:12:31 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4MhFSY3nGgz3cdy for ; Tue, 4 Oct 2022 09:12:29 +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=nEhFnZ4+; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from gandalf.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 4MhFSB6tG6z2xsL for ; Tue, 4 Oct 2022 09:12:10 +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=nEhFnZ4+; 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 4MhFS64cPlz4x1F; Tue, 4 Oct 2022 09:12:06 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1664835126; bh=0c+SzmccFkv+qi7iD7DLPmYckdmiYVEdqmGxGj+h9t4=; h=Date:From:To:Cc:Subject:From; b=nEhFnZ4+dmTDVXYht1hFM97IUlmTdGSsDwMt0Nxe1KHuvFJkT232Th8rMrdWdLKp+ GWF26cSSseYAgGy56ookATcllUj2aVCcG8VYMLklidqxHVCBtlhhqLgUJeRjDIUCTV m/BAD5FyJ/EulQwUISCO4vjlNyhpCdMTzmDdwExWZlB33kMtf0o4lJmKCktonIvDBx AiwKWZ2zAd+WoE8C2k1lcalANaJGAaUiEUtYmEjkH9jaiVYj5mgCfqbvZJb89Ao/jE 6iQH0V8Eoi/vqYMvS29B20NSZdxkM3dshnAyWFbFnGnDqfSblsQvByOEAYPIZpQSFH GpH7f1AskpsQQ== Date: Tue, 4 Oct 2022 09:12:05 +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: <20221004091205.2677b823@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/kernel/Makefile between commit: 321648455061 ("kbuild: use obj-y instead extra-y for objects placed at the head") from the kbuild tree and commit: dfc3095cec27 ("powerpc: Remove CONFIG_FSL_BOOKE") 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/kernel/Makefile index ad3decb9f20b,1f121c188805..000000000000 --- a/arch/powerpc/kernel/Makefile