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

[broonie]

Hi all,

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

  arch/s390/kernel/setup.c

between commit:

  944c78376a39b ("s390: use init_thread_union aka initial stack for the first process")

from the s390 tree and commit:

  9ea7e6b62c2bd ("init: Mark [arch_call_]rest_init() __noreturn")

from the tip 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 arch/s390/kernel/setup.c
index 0903fe3566341,4259b6c505163..0000000000000
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c