* linux-next: manual merge of the ftrace tree with the kbuild tree
@ 2022-01-12 0:21 Stephen Rothwell
2022-01-14 6:46 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2022-01-12 0:21 UTC (permalink / raw)
To: Steven Rostedt, Masahiro Yamada
Cc: Linux Kernel Mailing List, Linux Next Mailing List, Yinan Liu
[-- Attachment #1: Type: text/plain, Size: 1272 bytes --]
Hi all,
Today's linux-next merge of the ftrace tree got a conflict in:
scripts/link-vmlinux.sh
between commit:
7d153696e5db ("kbuild: do not include include/config/auto.conf from shell scripts")
from the kbuild tree and commit:
4f1f18311591 ("scripts: ftrace - move the sort-processing in ftrace_init")
from the ftrace 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 scripts/link-vmlinux.sh
index 5189c9a12066,dd9955f45774..000000000000
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@@ -412,11 -411,8 +412,8 @@@ if is_enabled CONFIG_BUILDTIME_TABLE_SO
fi
fi
- info SYSMAP System.map
- mksysmap vmlinux System.map
-
# step a (see comment above)
-if [ -n "${CONFIG_KALLSYMS}" ]; then
+if is_enabled CONFIG_KALLSYMS; then
mksysmap ${kallsyms_vmlinux} .tmp_System.map
if ! cmp -s System.map .tmp_System.map; then
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the ftrace tree with the kbuild tree
2022-01-12 0:21 linux-next: manual merge of the ftrace tree with the kbuild tree Stephen Rothwell
@ 2022-01-14 6:46 ` Stephen Rothwell
2022-01-16 21:52 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2022-01-14 6:46 UTC (permalink / raw)
To: Steven Rostedt, Masahiro Yamada
Cc: Linux Kernel Mailing List, Linux Next Mailing List, Yinan Liu
[-- Attachment #1: Type: text/plain, Size: 2339 bytes --]
Hi all,
On Wed, 12 Jan 2022 11:21:47 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the ftrace tree got a conflict in:
>
> scripts/link-vmlinux.sh
>
> between commit:
>
> 7d153696e5db ("kbuild: do not include include/config/auto.conf from shell scripts")
>
> from the kbuild tree and commit:
>
> 4f1f18311591 ("scripts: ftrace - move the sort-processing in ftrace_init")
>
> from the ftrace 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 scripts/link-vmlinux.sh
> index 5189c9a12066,dd9955f45774..000000000000
> --- a/scripts/link-vmlinux.sh
> +++ b/scripts/link-vmlinux.sh
> @@@ -412,11 -411,8 +412,8 @@@ if is_enabled CONFIG_BUILDTIME_TABLE_SO
> fi
> fi
>
> - info SYSMAP System.map
> - mksysmap vmlinux System.map
> -
> # step a (see comment above)
> -if [ -n "${CONFIG_KALLSYMS}" ]; then
> +if is_enabled CONFIG_KALLSYMS; then
> mksysmap ${kallsyms_vmlinux} .tmp_System.map
>
> if ! cmp -s System.map .tmp_System.map; then
My mistake, the merge resolution should be as below.
--
Cheers,
Stephen Rothwell
diff --cc scripts/link-vmlinux.sh
index 5189c9a12066,dd9955f45774..000000000000
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@@ -404,7 -400,10 +404,10 @@@ if is_enabled CONFIG_DEBUG_INFO_BTF &&
${RESOLVE_BTFIDS} vmlinux
fi
+ info SYSMAP System.map
+ mksysmap vmlinux System.map
+
-if [ -n "${CONFIG_BUILDTIME_TABLE_SORT}" ]; then
+if is_enabled CONFIG_BUILDTIME_TABLE_SORT; then
info SORTTAB vmlinux
if ! sorttable vmlinux; then
echo >&2 Failed to sort kernel tables
@@@ -412,11 -411,8 +415,8 @@@
fi
fi
- info SYSMAP System.map
- mksysmap vmlinux System.map
-
# step a (see comment above)
-if [ -n "${CONFIG_KALLSYMS}" ]; then
+if is_enabled CONFIG_KALLSYMS; then
mksysmap ${kallsyms_vmlinux} .tmp_System.map
if ! cmp -s System.map .tmp_System.map; then
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the ftrace tree with the kbuild tree
2022-01-14 6:46 ` Stephen Rothwell
@ 2022-01-16 21:52 ` Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2022-01-16 21:52 UTC (permalink / raw)
To: Masahiro Yamada
Cc: Steven Rostedt, Linux Kernel Mailing List,
Linux Next Mailing List, Yinan Liu
[-- Attachment #1: Type: text/plain, Size: 2644 bytes --]
Hi all,
On Fri, 14 Jan 2022 17:46:23 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Wed, 12 Jan 2022 11:21:47 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the ftrace tree got a conflict in:
> >
> > scripts/link-vmlinux.sh
> >
> > between commit:
> >
> > 7d153696e5db ("kbuild: do not include include/config/auto.conf from shell scripts")
> >
> > from the kbuild tree and commit:
> >
> > 4f1f18311591 ("scripts: ftrace - move the sort-processing in ftrace_init")
> >
> > from the ftrace 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 scripts/link-vmlinux.sh
> > index 5189c9a12066,dd9955f45774..000000000000
> > --- a/scripts/link-vmlinux.sh
> > +++ b/scripts/link-vmlinux.sh
> > @@@ -412,11 -411,8 +412,8 @@@ if is_enabled CONFIG_BUILDTIME_TABLE_SO
> > fi
> > fi
> >
> > - info SYSMAP System.map
> > - mksysmap vmlinux System.map
> > -
> > # step a (see comment above)
> > -if [ -n "${CONFIG_KALLSYMS}" ]; then
> > +if is_enabled CONFIG_KALLSYMS; then
> > mksysmap ${kallsyms_vmlinux} .tmp_System.map
> >
> > if ! cmp -s System.map .tmp_System.map; then
>
> My mistake, the merge resolution should be as below.
>
>
> diff --cc scripts/link-vmlinux.sh
> index 5189c9a12066,dd9955f45774..000000000000
> --- a/scripts/link-vmlinux.sh
> +++ b/scripts/link-vmlinux.sh
> @@@ -404,7 -400,10 +404,10 @@@ if is_enabled CONFIG_DEBUG_INFO_BTF &&
> ${RESOLVE_BTFIDS} vmlinux
> fi
>
> + info SYSMAP System.map
> + mksysmap vmlinux System.map
> +
> -if [ -n "${CONFIG_BUILDTIME_TABLE_SORT}" ]; then
> +if is_enabled CONFIG_BUILDTIME_TABLE_SORT; then
> info SORTTAB vmlinux
> if ! sorttable vmlinux; then
> echo >&2 Failed to sort kernel tables
> @@@ -412,11 -411,8 +415,8 @@@
> fi
> fi
>
> - info SYSMAP System.map
> - mksysmap vmlinux System.map
> -
> # step a (see comment above)
> -if [ -n "${CONFIG_KALLSYMS}" ]; then
> +if is_enabled CONFIG_KALLSYMS; then
> mksysmap ${kallsyms_vmlinux} .tmp_System.map
>
> if ! cmp -s System.map .tmp_System.map; then
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] 6+ messages in thread
* linux-next: manual merge of the ftrace tree with the kbuild tree
@ 2025-03-24 5:41 Stephen Rothwell
2025-03-30 23:57 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2025-03-24 5:41 UTC (permalink / raw)
To: Steven Rostedt, Masami Hiramatsu, Masahiro Yamada
Cc: Linux Kernel Mailing List, Linux Next Mailing List, Uday Shankar
[-- Attachment #1: Type: text/plain, Size: 782 bytes --]
Hi all,
Today's linux-next merge of the ftrace tree got a conflict in:
scripts/tracing/draw_functrace.py
between commit:
9d702bb1d3c0 ("scripts: make python shebangs specific about desired version")
from the kbuild tree and commit:
a926d15a799a ("scripts/tracing: Remove scripts/tracing/draw_functrace.py")
from the ftrace tree.
I fixed it up (I just removed the file) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the ftrace tree with the kbuild tree
2025-03-24 5:41 Stephen Rothwell
@ 2025-03-30 23:57 ` Stephen Rothwell
2025-03-31 16:12 ` Steven Rostedt
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2025-03-30 23:57 UTC (permalink / raw)
To: Masami Hiramatsu, Masahiro Yamada
Cc: Steven Rostedt, Linux Kernel Mailing List,
Linux Next Mailing List, Uday Shankar
[-- Attachment #1: Type: text/plain, Size: 976 bytes --]
Hi all,
On Mon, 24 Mar 2025 16:41:11 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the ftrace tree got a conflict in:
>
> scripts/tracing/draw_functrace.py
>
> between commit:
>
> 9d702bb1d3c0 ("scripts: make python shebangs specific about desired version")
>
> from the kbuild tree and commit:
>
> a926d15a799a ("scripts/tracing: Remove scripts/tracing/draw_functrace.py")
>
> from the ftrace tree.
>
> I fixed it up (I just removed the file) 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.
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] 6+ messages in thread* Re: linux-next: manual merge of the ftrace tree with the kbuild tree
2025-03-30 23:57 ` Stephen Rothwell
@ 2025-03-31 16:12 ` Steven Rostedt
0 siblings, 0 replies; 6+ messages in thread
From: Steven Rostedt @ 2025-03-31 16:12 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Masami Hiramatsu, Masahiro Yamada, Linux Kernel Mailing List,
Linux Next Mailing List, Uday Shankar
On Mon, 31 Mar 2025 10:57:08 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > I fixed it up (I just removed the file) 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.
>
> This is now a conflict between the kbuild tree and Linus' tree.
Thanks. It's a trivial conflict as the file is simply deleted. The change
to that file should just be dropped.
That script has been broken for years and nobody complained about it.
-- Steve
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-03-31 16:11 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-12 0:21 linux-next: manual merge of the ftrace tree with the kbuild tree Stephen Rothwell
2022-01-14 6:46 ` Stephen Rothwell
2022-01-16 21:52 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2025-03-24 5:41 Stephen Rothwell
2025-03-30 23:57 ` Stephen Rothwell
2025-03-31 16:12 ` Steven Rostedt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox