diff mbox series

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

Message ID 20221004091205.2677b823@canb.auug.org.au (mailing list archive)
State Not Applicable
Headers show
Series linux-next: manual merge of the powerpc tree with the kbuild tree | expand

Commit Message

Stephen Rothwell Oct. 3, 2022, 10:12 p.m. UTC
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.

Comments

Stephen Rothwell Oct. 9, 2022, 10:16 p.m. UTC | #1
Hi all,

On Tue, 4 Oct 2022 09:12:05 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> 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.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc arch/powerpc/kernel/Makefile
> index ad3decb9f20b,1f121c188805..000000000000
> --- a/arch/powerpc/kernel/Makefile
> +++ b/arch/powerpc/kernel/Makefile
> @@@ -118,12 -116,12 +116,12 @@@ obj-$(CONFIG_PPC_E500)		+= cpu_setup_e5
>   obj-$(CONFIG_PPC_DOORBELL)	+= dbell.o
>   obj-$(CONFIG_JUMP_LABEL)	+= jump_label.o
>   
>  -extra-$(CONFIG_PPC64)		:= head_64.o
>  -extra-$(CONFIG_PPC_BOOK3S_32)	:= head_book3s_32.o
>  -extra-$(CONFIG_40x)		:= head_40x.o
>  -extra-$(CONFIG_44x)		:= head_44x.o
>  -extra-$(CONFIG_PPC_85xx)	:= head_85xx.o
>  -extra-$(CONFIG_PPC_8xx)		:= head_8xx.o
>  +obj-$(CONFIG_PPC64)		+= head_64.o
>  +obj-$(CONFIG_PPC_BOOK3S_32)	+= head_book3s_32.o
>  +obj-$(CONFIG_40x)		+= head_40x.o
>  +obj-$(CONFIG_44x)		+= head_44x.o
> - obj-$(CONFIG_FSL_BOOKE)		+= head_fsl_booke.o
> ++obj-$(CONFIG_PPC_85xx)		:= head_85xx.o
>  +obj-$(CONFIG_PPC_8xx)		+= head_8xx.o
>   extra-y				+= vmlinux.lds
>   
>   obj-$(CONFIG_RELOCATABLE)	+= reloc_$(BITS).o

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

Patch

diff --cc arch/powerpc/kernel/Makefile
index ad3decb9f20b,1f121c188805..000000000000
--- a/arch/powerpc/kernel/Makefile