linux-next: manual merge of the generic-ipi tree

Hi Ingo, Jens,

Today's linux-next merge of the generic-ipi tree got a conflict in
arch/powerpc/mm/slice.c between commit
3a8247cc2c856930f34eafce33f6a039227ee175 ("powerpc: Only demote
individual slices rather than whole process") from the powerpc tree and
commit 15c8b6c1aaaf1c4edd67e2f02e4d8e1bd1a51c0d ("on_each_cpu(): kill
unused 'retry' parameter") from the generic-ipi tree.

The former removes the code that the latter modifies.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/