* linux-next: manual merge of the powerpc tree with the kbuild tree
@ 2022-09-29 11:02 broonie
0 siblings, 0 replies; 8+ messages in thread
From: broonie @ 2022-09-29 11:02 UTC (permalink / raw)
To: Michael Ellerman, PowerPC
Cc: Christophe Leroy, Linux Kernel Mailing List,
Linux Next Mailing List, Masahiro Yamada
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 tree and commits:
dfc3095cec27f ("powerpc: Remove CONFIG_FSL_BOOKE")
688de017efaab ("powerpc: Change CONFIG_E500 to CONFIG_PPC_E500")
3e7318584dfec ("powerpc: Remove CONFIG_PPC_FSL_BOOK3E")
6556fd1a1e9fc ("powerpc: Cleanup idle for e500")
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/Makefile
index 89c27827a11fb,19470d29de163..0000000000000
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
diff --cc arch/powerpc/kernel/Makefile
index ad3decb9f20ba,1f121c1888051..0000000000000
--- 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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: manual merge of the powerpc tree with the kbuild tree
2022-10-03 22:16 Stephen Rothwell
@ 2022-10-09 22:17 ` Stephen Rothwell
0 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2022-10-09 22:17 UTC (permalink / raw)
To: Masahiro Yamada
Cc: Michael Ellerman, PowerPC, Christophe Leroy,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1842 bytes --]
Hi all,
On Tue, 4 Oct 2022 09:16:06 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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@canb.auug.org.au>
> 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@canb.auug.org.au>
> ---
> 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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: manual merge of the powerpc tree with the kbuild tree
2022-10-03 22:12 Stephen Rothwell
@ 2022-10-09 22:16 ` Stephen Rothwell
0 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2022-10-09 22:16 UTC (permalink / raw)
To: Masahiro Yamada
Cc: Michael Ellerman, PowerPC, Christophe Leroy,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1976 bytes --]
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* linux-next: manual merge of the powerpc tree with the kbuild tree
@ 2022-10-03 22:16 Stephen Rothwell
2022-10-09 22:17 ` Stephen Rothwell
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2022-10-03 22:16 UTC (permalink / raw)
To: Michael Ellerman, PowerPC, Masahiro Yamada
Cc: Christophe Leroy, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1597 bytes --]
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 <sfr@canb.auug.org.au>
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@canb.auug.org.au>
---
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
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 8+ messages in thread
* linux-next: manual merge of the powerpc tree with the kbuild tree
@ 2022-10-03 22:12 Stephen Rothwell
2022-10-09 22:16 ` Stephen Rothwell
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2022-10-03 22:12 UTC (permalink / raw)
To: Michael Ellerman, PowerPC, Masahiro Yamada
Cc: Christophe Leroy, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1691 bytes --]
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.
--
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: manual merge of the powerpc tree with the kbuild tree
2018-05-30 23:32 Stephen Rothwell
@ 2018-06-07 23:52 ` Stephen Rothwell
0 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2018-06-07 23:52 UTC (permalink / raw)
To: Masahiro Yamada
Cc: Michael Ellerman, Benjamin Herrenschmidt, PowerPC,
Linux-Next Mailing List, Linux Kernel Mailing List,
Nicholas Piggin, Naveen N. Rao
[-- Attachment #1: Type: text/plain, Size: 1690 bytes --]
Hi all,
On Thu, 31 May 2018 09:32:16 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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 tree and commit:
>
> 250122baed29 ("powerpc64/module: Tighten detection of mcount call sites with -mprofile-kernel")
>
> 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/module_64.c
> index 55bccc315e1a,f7667e2ebfcb..000000000000
> --- a/arch/powerpc/kernel/module_64.c
> +++ b/arch/powerpc/kernel/module_64.c
> @@@ -462,9 -466,12 +466,12 @@@ static unsigned long stub_for_addr(cons
> return (unsigned long)&stubs[i];
> }
>
> -#ifdef CC_USING_MPROFILE_KERNEL
> +#ifdef CONFIG_MPROFILE_KERNEL
> - static bool is_early_mcount_callsite(u32 *instruction)
> + static bool is_mprofile_mcount_callsite(const char *name, u32 *instruction)
> {
> + if (strcmp("_mcount", name))
> + return false;
> +
> /*
> * Check if this is one of the -mprofile-kernel sequences.
> */
This is now a conflict between the kbuild tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* linux-next: manual merge of the powerpc tree with the kbuild tree
@ 2018-05-30 23:32 Stephen Rothwell
2018-06-07 23:52 ` Stephen Rothwell
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2018-05-30 23:32 UTC (permalink / raw)
To: Michael Ellerman, Benjamin Herrenschmidt, PowerPC, Masahiro Yamada
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
Nicholas Piggin, Naveen N. Rao
[-- Attachment #1: Type: text/plain, Size: 1415 bytes --]
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 call sites with -mprofile-kernel")
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/module_64.c
index 55bccc315e1a,f7667e2ebfcb..000000000000
--- a/arch/powerpc/kernel/module_64.c
+++ b/arch/powerpc/kernel/module_64.c
@@@ -462,9 -466,12 +466,12 @@@ static unsigned long stub_for_addr(cons
return (unsigned long)&stubs[i];
}
-#ifdef CC_USING_MPROFILE_KERNEL
+#ifdef CONFIG_MPROFILE_KERNEL
- static bool is_early_mcount_callsite(u32 *instruction)
+ static bool is_mprofile_mcount_callsite(const char *name, u32 *instruction)
{
+ if (strcmp("_mcount", name))
+ return false;
+
/*
* Check if this is one of the -mprofile-kernel sequences.
*/
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* linux-next: manual merge of the powerpc tree with the kbuild tree
@ 2016-09-21 0:24 Stephen Rothwell
0 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2016-09-21 0:24 UTC (permalink / raw)
To: Michael Ellerman, Benjamin Herrenschmidt, PowerPC, Michal Marek
Cc: linux-next, linux-kernel, Al Viro, Nicholas Piggin
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 asm functions")
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/misc_32.S
index f5156105c5f3,03756ffdcd71..000000000000
--- a/arch/powerpc/kernel/misc_32.S
+++ b/arch/powerpc/kernel/misc_32.S
@@@ -360,7 -358,8 +360,9 @@@ END_FTR_SECTION_IFSET(CPU_FTR_COHERENT_
sync /* additional sync needed on g4 */
isync
blr
+ _ASM_NOKPROBE_SYMBOL(flush_icache_range)
+EXPORT_SYMBOL(flush_icache_range)
+
/*
* Flush a particular page from the data cache to RAM.
* Note: this is necessary because the instruction cache does *not*
diff --cc arch/powerpc/kernel/misc_64.S
index 8b526846e72a,5d7e583f1588..000000000000
--- a/arch/powerpc/kernel/misc_64.S
+++ b/arch/powerpc/kernel/misc_64.S
@@@ -110,8 -109,8 +110,9 @@@ END_FTR_SECTION_IFSET(CPU_FTR_COHERENT_
bdnz 2b
isync
blr
- .previous .text
+ _ASM_NOKPROBE_SYMBOL(flush_icache_range)
+EXPORT_SYMBOL(flush_icache_range)
+
/*
* Like above, but only do the D-cache.
*
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-10-09 22:26 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-29 11:02 linux-next: manual merge of the powerpc tree with the kbuild tree broonie
-- strict thread matches above, loose matches on Subject: below --
2022-10-03 22:16 Stephen Rothwell
2022-10-09 22:17 ` Stephen Rothwell
2022-10-03 22:12 Stephen Rothwell
2022-10-09 22:16 ` Stephen Rothwell
2018-05-30 23:32 Stephen Rothwell
2018-06-07 23:52 ` Stephen Rothwell
2016-09-21 0:24 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).