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

Hi all, On Wed, 13 Nov 2024 09:52:28 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the powerpc tree got a conflict in: > > arch/powerpc/Makefile > > between commit: > > de51342c5157 ("kbuild: add $(objtree)/ prefix to some in-kernel build > artifacts") > > from the kbuil

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

Stephen Rothwell writes: > Hi all, > > Today's linux-next merge of the powerpc tree got a conflict in: > > arch/powerpc/Makefile > > between commit: > > de51342c5157 ("kbuild: add $(objtree)/ prefix to some in-kernel build > artifacts") > > from the kbuild tree and commit: > > bee08a9e6ab0

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

Hi all, Today's linux-next merge of the powerpc tree got a conflict in: arch/powerpc/Makefile between commit: de51342c5157 ("kbuild: add $(objtree)/ prefix to some in-kernel build artifacts") from the kbuild tree and commit: bee08a9e6ab0 ("powerpc: Adjust adding stack protector flags t

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

Hi all, On Tue, 4 Oct 2022 09:16:06 +1100 Stephen Rothwell 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

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

Hi all, On Tue, 4 Oct 2022 09:12:05 +1100 Stephen Rothwell 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 th

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

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 t

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

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") fro

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

Hi all, Today's linux-next merge of the powerpc tree got conflicts in: arch/powerpc/Makefile arch/powerpc/kernel/Makefile between commits: 4f62512adbe9a ("kbuild: use obj-y instead extra-y for objects placed at the head") 0f17eda6118db ("kbuild: remove head-y syntax") from the kbuild

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

Hi all, On Thu, 31 May 2018 09:32:16 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the powerpc tree got a conflict in: > > arch/powerpc/kernel/module_64.c > > between commit: > > 06aeb9e3f2bc ("powerpc/kbuild: move -mprofile-kernel check to Kconfig") > > from the kbuild t

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

Hi all, Today's linux-next merge of the powerpc tree got a conflict in: arch/powerpc/kernel/module_64.c between commit: 06aeb9e3f2bc ("powerpc/kbuild: move -mprofile-kernel check to Kconfig") from the kbuild tree and commit: 250122baed29 ("powerpc64/module: Tighten detection of mcount c

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

Hi all, Today's linux-next merge of the powerpc tree got conflicts in: arch/powerpc/kernel/misc_32.S arch/powerpc/kernel/misc_64.S between commit: 9445aa1a3062 ("ppc: move exports to definitions") from the kbuild tree and commit: 6f698df10cb2 ("powerpc/kernel: Use kprobe blacklist for