linux-next: manual merge of the akpm tree with the s390 tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1636 bytes --]

Hi Andrew,

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

  arch/s390/kernel/setup.c

between commit:

  b45248da1a33 ("s390: unify stack size definitions")
  ee46f78659ac ("s390: add support for virtually mapped kernel stacks")

from the s390 tree and commit:

  ab9c2b8deb1b ("memblock: remove _virt from APIs returning virtual address")

from the akpm 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/kernel/setup.c
index 2a20e6ef8369,2e29456ca11e..000000000000
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@@ -418,12 -357,8 +418,12 @@@ static void __init setup_lowcore(void
  	lc->last_update_timer = S390_lowcore.last_update_timer;
  	lc->last_update_clock = S390_lowcore.last_update_clock;
  
 -	restart_stack = memblock_alloc(ASYNC_SIZE, ASYNC_SIZE);
 -	restart_stack += ASYNC_SIZE;
 +	/*
 +	 * Allocate the global restart stack which is the same for
 +	 * all CPUs in cast *one* of them does a PSW restart.
 +	 */
- 	restart_stack = memblock_virt_alloc(THREAD_SIZE, THREAD_SIZE);
++	restart_stack = memblock_alloc(THREAD_SIZE, THREAD_SIZE);
 +	restart_stack += STACK_INIT_OFFSET;
  
  	/*
  	 * Set up PSW restart to call ipl.c:do_restart(). Copy the relevant

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]