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

From: Heiko Carstens <[email-masked]>
Date: Wed, 8 May 2024 15:18:26 +0200

Hi Stephen,

On Wed, May 08, 2024 at 09:57:26AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the s390 tree got a conflict in:
> 
>   scripts/Makefile.vdsoinst
> 
> between commit:
> 
>   d6d223135547 ("kbuild: simplify generic vdso installation code")
> 
> from the kbuild tree and commit:
> 
>   4cfae05eb3aa ("s390/vdso: Create .build-id links for unstripped vdso files")
> 
> from the s390 tree.

...

> diff --cc scripts/Makefile.vdsoinst
> index bf72880c50d0,a81ca735003e..000000000000
> --- a/scripts/Makefile.vdsoinst
> +++ b/scripts/Makefile.vdsoinst
> @@@ -20,8 -21,8 +20,8 @@@ $$(dest): $(1) FORC
>   	$$(call cmd,install)
>   
>   # Some architectures create .build-id symlinks
> - ifneq ($(filter arm sparc x86, $(SRCARCH)),)
> + ifneq ($(filter arm s390 sparc x86, $(SRCARCH)),)
>  -link := $(install-dir)/.build-id/$$(shell $(READELF) -n $$(src) | sed -n 's@^.*Build ID: \(..\)\(.*\)@\1/\2@p').debug
>  +link := $(install-dir)/.build-id/$$(shell $(READELF) -n $(1) | sed -n 's@^.*Build ID: \(..\)\(.*\)@\1/\2@p').debug

You can drop this fixup, since I removed the above referenced commit from
the s390 tree again.