From: Boris Brezillon <boris.brezillon@free-electrons.com>
Date: Mon, 28 Aug 2017 16:04:15 +0000 (+0200)
Subject: Merge tag 'v4.13-rc7' into mtd/next
X-Git-Tag: MMI-PSA29.97-13-9~4762^2~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5ffa70b2a38befadb920b85fe87f5da2b4cff623;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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.
---

5ffa70b2a38befadb920b85fe87f5da2b4cff623
diff --cc include/asm-generic/vmlinux.lds.h
index ff507c178327,9623d78f8494..969ee1078ada
--- a/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							\
 +	*(.xiptext)							\
- 	*(.data .data.[0-9a-zA-Z_]*)					\
+ 	*(DATA_MAIN)							\
  	*(.ref.data)							\
  	*(.data..shared_aligned) /* percpu related */			\
  	MEM_KEEP(init.data)						\