Hi all, Today's linux-next merge of the risc-v tree got a conflict in: arch/riscv/kernel/vdso/Makefile between commit: a96843372331 ("kbuild: explicitly specify the build id style") from Linus' tree and commit: f69e1c7418b1 ("RISC-V: Fix the VDSO symbol generaton for binutils-2.35+") from the risc-v 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/riscv/kernel/vdso/Makefile index 7d6a94d45ec9,a8ecf102e09b..000000000000 --- a/arch/riscv/kernel/vdso/Makefile +++ b/arch/riscv/kernel/vdso/Makefile @@@ -43,6 -43,8 +43,8 @@@ $(obj)/vdso.o: $(obj)/vdso.s SYSCFLAGS_vdso.so.dbg = $(c_flags) $(obj)/vdso.so.dbg: $(src)/vdso.lds $(obj-vdso) FORCE $(call if_changed,vdsold) + SYSCFLAGS_vdso.so.dbg = -shared -s -Wl,-soname=linux-vdso.so.1 \ - -Wl,--build-id -Wl,--hash-style=both ++ -Wl,--build-id=sha1 -Wl,--hash-style=both # We also create a special relocatable object that should mirror the symbol # table and layout of the linked DSO. With ld --just-symbols we can then
Attachment:
pgpppZkPTeDkf.pgp
Description: OpenPGP digital signature