Received-SPF: pass (google.com: domain of linux-kernel+bounces-172537-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Date: Wed, 8 May 2024 09:57:26 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Heiko Carstens <hca@linux.ibm.com>, Vasily Gorbik <gor@linux.ibm.com>,
 Christian Borntraeger <borntraeger@de.ibm.com>, Masahiro Yamada
 <masahiroy@kernel.org>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>, Jens Remus
 <jremus@linux.ibm.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the s390 tree with the kbuild tree
Message-ID: <20240508095726.32237e53@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/1tp04PMxwjC/1OLuKhc1.jA";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/1tp04PMxwjC/1OLuKhc1.jA
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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 file=
s")

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.

--=20
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)
 =20
  # Some architectures create .build-id symlinks
- ifneq ($(filter arm sparc x86, $(SRCARCH)),)
+ ifneq ($(filter arm s390 sparc x86, $(SRCARCH)),)
 -link :=3D $(install-dir)/.build-id/$$(shell $(READELF) -n $$(src) | sed -=
n 's@^.*Build ID: \(..\)\(.*\)@\1/\2@p').debug
 +link :=3D $(install-dir)/.build-id/$$(shell $(READELF) -n $(1) | sed -n '=
s@^.*Build ID: \(..\)\(.*\)@\1/\2@p').debug
 =20
  __default: $$(link)
  $$(link): $$(dest) FORCE

--Sig_/1tp04PMxwjC/1OLuKhc1.jA
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmY6v+YACgkQAVBC80lX
0GxEAQf+LOLDDPPXCsRtyNVh8cGbDdx356TB/E4Pbl/ew3xafjEx/yrPz0QV3YyB
1L1gikOZ8JK5hlvDVmt33hlmnp+bMt8GrnazdCnarhxfIBZk0XnYTLG9IZRxGpG4
fq5J16d8hhyvR+9D73TsAv35+EdDT+ju7vRyjjb7OhabYpQ1Rt+npreOBKIgCTzF
JheE1wkje5sAsfDWIFtid987DW6DuQfIpB9CxGc1XtzkJBanxGRiLZhonz+ILQGD
QrY/+pJtjyb//Qu+IAq2qsfEFhD8gWnGQt7GNiSzEqF9vw6NvLwqI5crM+qJ8MNO
MxQFUmoWg66380N2OZZjYtmaJUIIHw==
=J9g7
-----END PGP SIGNATURE-----

--Sig_/1tp04PMxwjC/1OLuKhc1.jA--