From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Steven Rostedt <rostedt@goodmis.org>,
Masahiro Yamada <masahiroy@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Yinan Liu <yinan@linux.alibaba.com>
Subject: Re: linux-next: manual merge of the ftrace tree with the kbuild tree
Date: Fri, 14 Jan 2022 17:46:23 +1100 [thread overview]
Message-ID: <20220114174623.729249d7@canb.auug.org.au> (raw)
In-Reply-To: <20220112112147.3e19ce23@canb.auug.org.au>
[-- 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 --]
next prev parent reply other threads:[~2022-01-14 6:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2022-01-16 21:52 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220114174623.729249d7@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=rostedt@goodmis.org \
--cc=yinan@linux.alibaba.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.