linux-next: manual merge of the s390 tree with the kbuild tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

Today's linux-next merge of the s390 tree got a conflict in:

  arch/s390/Makefile

between commit:

  9b400d17259b ("kbuild: Introduce Kconfig symbol for linking vmlinux with relocations")

from the kbuild tree and commit:

  991a20173a1f ("s390: Fix linker error when -no-pie option is unavailable")

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/Makefile
index d5f4be440879,fd3b70d9aab1..000000000000
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@@ -15,7 -15,7 +15,7 @@@ KBUILD_CFLAGS_MODULE += -fPI
  KBUILD_AFLAGS	+= -m64
  KBUILD_CFLAGS	+= -m64
  KBUILD_CFLAGS	+= -fPIC
- LDFLAGS_vmlinux	:= -no-pie
 -LDFLAGS_vmlinux	:= $(call ld-option,-no-pie) --emit-relocs --discard-none
++LDFLAGS_vmlinux	:= $(call ld-option,-no-pie)
  extra_tools	:= relocs
  aflags_dwarf	:= -Wa,-gdwarf-2
  KBUILD_AFLAGS_DECOMPRESSOR := $(CLANG_FLAGS) -m64 -D__ASSEMBLY__

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]