* linux-next: manual merge of the s390 tree with the kbuild tree
@ 2017-03-30 23:54 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2017-03-30 23:54 UTC (permalink / raw)
To: Martin Schwidefsky, Heiko Carstens, Masahiro Yamada
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Nicolas Dichtel
Hi all,
Today's linux-next merge of the s390 tree got a conflict in:
arch/s390/include/uapi/asm/Kbuild
between commit:
65017bab8a9e ("uapi: export all headers under uapi directories")
from the kbuild tree and commit:
c30abecb39d1 ("s390/uapi: use generic headers if possible")
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 arch/s390/include/uapi/asm/Kbuild
index b15bf6bc0e94,addb09cee0f5..000000000000
--- a/arch/s390/include/uapi/asm/Kbuild
+++ b/arch/s390/include/uapi/asm/Kbuild
@@@ -1,2 -1,58 +1,12 @@@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
+
+ generic-y += errno.h
+ generic-y += fcntl.h
+ generic-y += ioctl.h
+ generic-y += mman.h
+ generic-y += param.h
+ generic-y += poll.h
+ generic-y += resource.h
+ generic-y += sockios.h
+ generic-y += termbits.h
-
-header-y += auxvec.h
-header-y += bitsperlong.h
-header-y += byteorder.h
-header-y += chpid.h
-header-y += chsc.h
-header-y += clp.h
-header-y += cmb.h
-header-y += dasd.h
-header-y += debug.h
-header-y += errno.h
-header-y += guarded_storage.h
-header-y += hypfs.h
-header-y += ioctls.h
-header-y += ipcbuf.h
-header-y += kvm.h
-header-y += kvm_para.h
-header-y += kvm_perf.h
-header-y += kvm_virtio.h
-header-y += monwriter.h
-header-y += msgbuf.h
-header-y += pkey.h
-header-y += posix_types.h
-header-y += ptrace.h
-header-y += qeth.h
-header-y += schid.h
-header-y += sclp_ctl.h
-header-y += sembuf.h
-header-y += setup.h
-header-y += shmbuf.h
-header-y += sie.h
-header-y += sigcontext.h
-header-y += siginfo.h
-header-y += signal.h
-header-y += socket.h
-header-y += stat.h
-header-y += statfs.h
-header-y += swab.h
-header-y += tape390.h
-header-y += termios.h
-header-y += types.h
-header-y += ucontext.h
-header-y += unistd.h
-header-y += virtio-ccw.h
-header-y += vtoc.h
-header-y += zcrypt.h
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the s390 tree with the kbuild tree
2024-05-07 23:57 Stephen Rothwell
@ 2024-05-08 13:18 ` Heiko Carstens
0 siblings, 0 replies; 4+ messages in thread
From: Heiko Carstens @ 2024-05-08 13:18 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Vasily Gorbik, Christian Borntraeger, Masahiro Yamada,
Alexander Gordeev, Jens Remus, Linux Kernel Mailing List,
Linux Next Mailing List
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the s390 tree with the kbuild tree
@ 2024-05-07 23:57 Stephen Rothwell
2024-05-08 13:18 ` Heiko Carstens
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2024-05-07 23:57 UTC (permalink / raw)
To: Heiko Carstens, Vasily Gorbik, Christian Borntraeger, Masahiro Yamada
Cc: Alexander Gordeev, Jens Remus, Linux Kernel Mailing List,
Linux Next Mailing List
[-- 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 --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the s390 tree with the kbuild tree
@ 2017-03-27 23:37 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2017-03-27 23:37 UTC (permalink / raw)
To: Martin Schwidefsky, Heiko Carstens, Masahiro Yamada
Cc: linux-next, linux-kernel, Nicolas Dichtel
Hi all,
Today's linux-next merge of the s390 tree got a conflict in:
arch/s390/include/uapi/asm/Kbuild
between commit:
65017bab8a9e ("uapi: export all headers under uapi directories")
from the kbuild tree and commit:
916cda1aa1b4 ("s390: add a system call for guarded storage")
from the s390 tree.
I fixed it up (the form should supercede the latter, so I used the former)
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-05-08 13:21 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-30 23:54 linux-next: manual merge of the s390 tree with the kbuild tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2024-05-07 23:57 Stephen Rothwell
2024-05-08 13:18 ` Heiko Carstens
2017-03-27 23:37 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).