Re: linux-next: manual merge of the powerpc tree with the kbuild tree

[Stephen Rothwell]

Hi all,

On Tue, 4 Oct 2022 09:16:06 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> 
> 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 <sfr@xxxxxxxxxxxxxxxx>
> 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 <sfr@xxxxxxxxxxxxxxxx>
> ---
>  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
> -- 
> 2.35.1

This is now a conflict between the kbuild tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpvL3MSoNPIz.pgp
Description: OpenPGP digital signature