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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 14 Jan 2022 17:46:23 +1100

Hi all,

On Wed, 12 Jan 2022 11:21:47 +1100 Stephen Rothwell <[email-masked]> 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