Merge tag 'v4.13-rc7' into mtd/next

Merge v4.13-rc7 back to resolve merge conflicts in
drivers/mtd/nand/nandsim.c and include/asm-generic/vmlinux.lds.h.

diff --cc include/asm-generic/vmlinux.lds.h
index ff507c178327f5df884db207e9ca469be58e4075,9623d78f84947e3d2fa51c7e7839932e5572441b..969ee1078adad4345441f13fa1056982bda3998f
--- 1/include/asm-generic/vmlinux.lds.h
--- 2/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@@ -198,13 -214,9 +214,10 @@@
  
  /*
   * .data section
-  * LD_DEAD_CODE_DATA_ELIMINATION option enables -fdata-sections generates
-  * .data.identifier which needs to be pulled in with .data, but don't want to
-  * pull in .data..stuff which has its own requirements. Same for bss.
   */
  #define DATA_DATA                                                     \
-       *(.data .data.[0-9a-zA-Z_]*)                                    \
 +      *(.xiptext)                                                     \
+       *(DATA_MAIN)                                                    \
        *(.ref.data)                                                    \
        *(.data..shared_aligned) /* percpu related */                   \
        MEM_KEEP(init.data)                                             \