Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull x86 fixlet from Thomas Gleixner.

Remove a warning about lack of compiler support for retpoline that most
people can't do anything about, so it just annoys them needlessly.

* 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/retpoline: Remove compile time warning

diff --combined arch/x86/Makefile
index e98f8e2,504b1a4..fad5516
--- 1/arch/x86/Makefile
--- 2/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@@ -158,6 -158,11 +158,6 @@@ ifdef CONFIG_X86_X3
  endif
  export CONFIG_X86_X32_ABI
  
 -# Don't unroll struct assignments with kmemcheck enabled
 -ifeq ($(CONFIG_KMEMCHECK),y)
 -      KBUILD_CFLAGS += $(call cc-option,-fno-builtin-memcpy)
 -endif
 -
  #
  # If the function graph tracer is used with mcount instead of fentry,
  # '-maccumulate-outgoing-args' is needed to prevent a GCC bug
@@@ -235,8 -240,6 +235,6 @@@ ifdef CONFIG_RETPOLIN
      RETPOLINE_CFLAGS += $(call cc-option,-mindirect-branch=thunk-extern -mindirect-branch-register)
      ifneq ($(RETPOLINE_CFLAGS),)
          KBUILD_CFLAGS += $(RETPOLINE_CFLAGS) -DRETPOLINE
-     else
-         $(warning CONFIG_RETPOLINE=y, but not supported by the compiler. Toolchain update recommended.)
      endif
  endif