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

[Stephen Rothwell]

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 up (the former removed the code updated by the latter) and
can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: signature.asc
Description: PGP signature