linux-next: manual merge of the s390 tree with Linus' tree

[Stephen Rothwell]

Hi all,

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

  arch/s390/Kconfig

between commit:

  008071917dfc ("s390/crc32: expose CRC32 functions through lib")

from Linus' tree and commit:

  3bcc8a1af581 ("s390/sclp: Initialize sclp subsystem via arch_cpu_finalize_init()")

from the s390 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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/s390/Kconfig
index 6e9545d8b0c7,f49ca2b485f6..000000000000
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@@ -72,7 -78,7 +78,8 @@@ config S39
  	select ARCH_ENABLE_MEMORY_HOTPLUG if SPARSEMEM
  	select ARCH_ENABLE_MEMORY_HOTREMOVE
  	select ARCH_ENABLE_SPLIT_PMD_PTLOCK if PGTABLE_LEVELS > 2
+ 	select ARCH_HAS_CPU_FINALIZE_INIT
 +	select ARCH_HAS_CRC32
  	select ARCH_HAS_CURRENT_STACK_POINTER
  	select ARCH_HAS_DEBUG_VIRTUAL
  	select ARCH_HAS_DEBUG_VM_PGTABLE

Attachment: pgppLt6kM_zXG.pgp
Description: OpenPGP digital signature