All of lore.kernel.org
 help / color / mirror / Atom feed
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
Date: Wed, 8 May 2024 09:57:26 +1000	[thread overview]
Message-ID: <20240508095726.32237e53@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1418 bytes --]

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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2024-05-07 23:57 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-07 23:57 Stephen Rothwell [this message]
2024-05-08 13:18 ` linux-next: manual merge of the s390 tree with the kbuild tree Heiko Carstens
  -- strict thread matches above, loose matches on Subject: below --
2017-03-30 23:54 Stephen Rothwell
2017-03-27 23:37 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=20240508095726.32237e53@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=agordeev@linux.ibm.com \
    --cc=borntraeger@de.ibm.com \
    --cc=gor@linux.ibm.com \
    --cc=hca@linux.ibm.com \
    --cc=jremus@linux.ibm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=masahiroy@kernel.org \
    /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.