linux-next: manual merge of the modules tree with the parisc tree

[Mark Brown]

Hi all,

Today's linux-next merge of the modules tree got a conflict in:

  scripts/module.lds.S

between commit:

  a62155bbcdd56 ("module.lds.S: Fix modules on 32-bit parisc architecture")

from the parisc tree and commit:

  4afc71bba8b7d ("module.lds,codetag: force 0 sh_addr for sections")

from the modules tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc scripts/module.lds.S
index 7c017b997fd74,2dc4c8c3e667e..0000000000000
--- a/scripts/module.lds.S
+++ b/scripts/module.lds.S
@@@ -38,16 -37,14 +37,16 @@@ SECTIONS 
  	.init.klp_objects	0 : ALIGN(8) { KEEP(*(.init.klp_objects)) }
  
  #ifdef CONFIG_ARCH_USES_CFI_TRAPS
- 	__kcfi_traps		: { KEEP(*(.kcfi_traps)) }
+ 	__kcfi_traps		0 : { KEEP(*(.kcfi_traps)) }
  #endif
  
 +#ifndef CONFIG_ARCH_WANTS_MODULES_TEXT_SECTIONS
- 	.text : {
+ 	.text			0 : {
  		*(.text .text.[0-9a-zA-Z_]*)
  	}
 +#endif
  
- 	.bss : {
+ 	.bss			0 : {
  		*(.bss .bss.[0-9a-zA-Z_]*)
  		*(.bss..L*)
  	}

Attachment: signature.asc
Description: PGP signature