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

Hi all, Today's linux-next merge of the akpm tree got a conflict in: drivers/s390/char/sclp_async.c between commit: 191fa92b3448 ("s390/sclp: remove call home support") from the s390 tree and patch: proc/sysctl: add shared variables for range check from the akpm tree. I fixed it up (

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

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: ab9c2b8deb1