Merge tag 'v4.9.171' into khadas-vim3-4.9.y

This is the 4.9.171 stable release

diff --cc Makefile
index 6514e83,dbdef74..833232e
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -674,56 -654,8 +674,55 @@@ KBUILD_CFLAGS    += $(call cc-option,-ffun
  KBUILD_CFLAGS += $(call cc-option,-fdata-sections,)
  endif
  
 +ifdef CONFIG_LTO_CLANG
 +lto-clang-flags       := -flto -fvisibility=hidden
 +
 +# allow disabling only clang LTO where needed
 +DISABLE_LTO_CLANG := -fno-lto -fvisibility=default
 +export DISABLE_LTO_CLANG
 +endif
 +
 +ifdef CONFIG_LTO
 +lto-flags     := $(lto-clang-flags)
 +KBUILD_CFLAGS += $(lto-flags)
 +
 +DISABLE_LTO   := $(DISABLE_LTO_CLANG)
 +export DISABLE_LTO
 +
 +# LDFINAL_vmlinux and LDFLAGS_FINAL_vmlinux can be set to override
 +# the linker and flags for vmlinux_link.
 +export LDFINAL_vmlinux LDFLAGS_FINAL_vmlinux
 +endif
 +
 +ifdef CONFIG_CFI_CLANG
 +cfi-clang-flags       += -fsanitize=cfi
 +DISABLE_CFI_CLANG := -fno-sanitize=cfi
 +ifdef CONFIG_MODULES
 +cfi-clang-flags       += -fsanitize-cfi-cross-dso
 +DISABLE_CFI_CLANG += -fno-sanitize-cfi-cross-dso
 +endif
 +ifdef CONFIG_CFI_PERMISSIVE
 +cfi-clang-flags       += -fsanitize-recover=cfi -fno-sanitize-trap=cfi
 +endif
 +
 +# also disable CFI when LTO is disabled
 +DISABLE_LTO_CLANG += $(DISABLE_CFI_CLANG)
 +# allow disabling only clang CFI where needed
 +export DISABLE_CFI_CLANG
 +endif
 +
 +ifdef CONFIG_CFI
 +# cfi-flags are re-tested in prepare-compiler-check
 +cfi-flags     := $(cfi-clang-flags)
 +KBUILD_CFLAGS += $(cfi-flags)
 +
 +DISABLE_CFI   := $(DISABLE_CFI_CLANG)
 +DISABLE_LTO   += $(DISABLE_CFI)
 +export DISABLE_CFI
 +endif
 +
  ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
- KBUILD_CFLAGS += $(call cc-option,-Oz,-Os)
- KBUILD_CFLAGS += $(call cc-disable-warning,maybe-uninitialized,)
+ KBUILD_CFLAGS += -Os $(call cc-disable-warning,maybe-uninitialized,)
  else
  ifdef CONFIG_PROFILE_ALL_BRANCHES
  KBUILD_CFLAGS += -O2 $(call cc-disable-warning,maybe-uninitialized,)

diff --cc arch/arm64/include/asm/futex.h
Simple merge

diff --cc crypto/testmgr.h
Simple merge

diff --cc kernel/sched/fair.c
Simple merge

diff --cc kernel/sysctl.c
Simple merge

diff --cc kernel/trace/ftrace.c
index ae6bdf3,0043aef..618c7de
--- 1/kernel/trace/ftrace.c
--- 2/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@@ -5310,9 -5310,9 +5311,10 @@@ static void ftrace_ops_list_func(unsign
  {
        __ftrace_ops_list_func(ip, parent_ip, NULL, regs);
  }
+ NOKPROBE_SYMBOL(ftrace_ops_list_func);
  #else
 -static void ftrace_ops_no_ops(unsigned long ip, unsigned long parent_ip)
 +static void ftrace_ops_no_ops(unsigned long ip, unsigned long parent_ip,
 +                            struct ftrace_ops *op, struct pt_regs *regs)
  {
        __ftrace_ops_list_func(ip, parent_ip, NULL, NULL);
  }

diff --cc net/ipv4/route.c
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge