From: Heiko Carstens <hca@linux.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Vasily Gorbik <gor@linux.ibm.com>,
Christian Borntraeger <borntraeger@de.ibm.com>,
Masahiro Yamada <masahiroy@kernel.org>,
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: Re: linux-next: manual merge of the s390 tree with the kbuild tree
Date: Wed, 8 May 2024 15:18:26 +0200 [thread overview]
Message-ID: <20240508131826.6522-B-hca@linux.ibm.com> (raw)
In-Reply-To: <20240508095726.32237e53@canb.auug.org.au>
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.
next prev parent reply other threads:[~2024-05-08 13:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-07 23:57 linux-next: manual merge of the s390 tree with the kbuild tree Stephen Rothwell
2024-05-08 13:18 ` Heiko Carstens [this message]
-- 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=20240508131826.6522-B-hca@linux.ibm.com \
--to=hca@linux.ibm.com \
--cc=agordeev@linux.ibm.com \
--cc=borntraeger@de.ibm.com \
--cc=gor@linux.ibm.com \
--cc=jremus@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=sfr@canb.auug.org.au \
/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.