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

Hi all, Today's linux-next merge of the percpu tree got a conflict in arch/s390/kernel/vtime.c between commit 4dc0f1e9c0a9 ("s390/idle: consolidate idle functions and definitions") from the s390 tree and commit eb7e7d766326 ("s390: Replace __get_cpu_var uses") from the percpu tree. I fixed it up

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

Hi all, Today's linux-next merge of the percpu tree got a conflict in arch/s390/kernel/processor.c between commit dfcc8c377711 ("s390/vtime: do not reset idle data on CPU hotplug") from the s390 tree and commit eb7e7d766326 ("s390: Replace __get_cpu_var uses") from the percpu tree. I fixed it up

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

Hi all, Today's linux-next merge of the percpu tree got a conflict in arch/s390/kernel/irq.c between commit 201b275f0459 ("s390/nohz: use a per-cpu flag for arch_needs_cpu") from the s390 tree and commit eb7e7d766326 ("s390: Replace __get_cpu_var uses") from the percpu tree. I fixed it up (the fo

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

Hi all, Today's linux-next merge of the percpu tree got a conflict in arch/s390/include/asm/cputime.h between commit 201b275f0459 ("s390/nohz: use a per-cpu flag for arch_needs_cpu") from the s390 tree and commit eb7e7d766326 ("s390: Replace __get_cpu_var uses") from the percpu tree. I fixed it u