Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
  kbuild: explain why DEBUG_SECTION_MISMATCH is UNDEFINED
  kbuild: fix building vmlinux.o
  kbuild: allow -fstack-protector to take effect
  kconfig: fix select in combination with default

diff --combined Makefile
index 67cc457,0d585c0..99300dc
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,8 -1,8 +1,8 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 25
 -EXTRAVERSION = -rc1
 -NAME = Arr Matey! A Hairy Bilge Rat!
 +EXTRAVERSION = -rc2
 +NAME = Funky Weasel is Jiggy wit it
  
  # *DOCUMENTATION*
  # To see a list of typical targets execute "make help"
@@@ -507,6 -507,10 +507,10 @@@ els
  KBUILD_CFLAGS += -O2
  endif
  
+ # Force gcc to behave correct even for buggy distributions
+ # Arch Makefiles may override this setting
+ KBUILD_CFLAGS += $(call cc-option, -fno-stack-protector)
+ 
  include $(srctree)/arch/$(SRCARCH)/Makefile
  
  ifdef CONFIG_FRAME_POINTER
@@@ -525,9 -529,6 +529,6 @@@ ifdef CONFIG_DEBUG_SECTION_MISMATC
  KBUILD_CFLAGS += $(call cc-option, -fno-inline-functions-called-once)
  endif
  
- # Force gcc to behave correct even for buggy distributions
- KBUILD_CFLAGS         += $(call cc-option, -fno-stack-protector)
- 
  # arch Makefile may override CC so keep this after arch Makefile is included
  NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
  CHECKFLAGS     += $(NOSTDINC_FLAGS)
@@@ -810,7 -811,9 +811,9 @@@ endi
        $(Q)rm -f .old_version
  
  # build vmlinux.o first to catch section mismatch errors early
- $(kallsyms.o): vmlinux.o
+ ifdef CONFIG_KALLSYMS
+ .tmp_vmlinux1: vmlinux.o
+ endif
  vmlinux.o: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) FORCE
        $(call if_changed_rule,vmlinux-modpost)