Merge tag 'v4.9.169' into khadas-vim3-4.9.y
authorNick <nick@khadas.com>
Tue, 21 May 2019 09:54:22 +0000 (17:54 +0800)
committerNick <nick@khadas.com>
Tue, 21 May 2019 09:54:22 +0000 (17:54 +0800)
This is the 4.9.169 stable release

 Conflicts:
arch/x86/entry/vdso/Makefile

1  2 
Makefile
arch/arm64/include/asm/futex.h
arch/arm64/mm/init.c
arch/x86/entry/vdso/Makefile
arch/x86/include/asm/xen/hypercall.h
drivers/pci/quirks.c
include/net/ip.h
kernel/irq/chip.c
kernel/sched/fair.c
net/ipv6/ip6_output.c
net/ipv6/ip6_tunnel.c

diff --cc Makefile
Simple merge
Simple merge
Simple merge
@@@ -165,14 -161,13 +161,14 @@@ $(obj)/vdso32.so.dbg: FORCE 
  # The DSO images are built using a special linker script.
  #
  quiet_cmd_vdso = VDSO    $@
-       cmd_vdso = $(CC) -nostdlib -o $@ \
+       cmd_vdso = $(LD) -nostdlib -o $@ \
                       $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
-                      -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
+                      -$(filter %.lds,$^) $(filter %.o,$^) && \
                 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
  
 -VDSO_LDFLAGS = -shared $(call ld-option, --hash-style=both) \
 -      $(call ld-option, --build-id) -Bsymbolic
 +VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=both) \
 +      $(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic $(LTO_CFLAGS) \
 +      $(filter --target=% --gcc-toolchain=%,$(KBUILD_CFLAGS))
  GCOV_PROFILE := n
  
  #
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge