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

[Stephen Rothwell]

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.

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/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
  
  __default: $$(link)
  $$(link): $$(dest) FORCE

Attachment: pgpgbztmRVV3P.pgp
Description: OpenPGP digital signature