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

From: Stephen Rothwell
Date: Tue Jun 04 2013 - 01:43:58 EST


Hi Andrew,

Today's linux-next merge of the akpm tree got conflicts in
include/linux/percpu-refcount.h and lib/percpu-refcount.c between commit
215e262f2aeb ("percpu: implement generic percpu refcounting") from the
percpu tree and commit "generic dynamic per cpu refcounting" from the
akpm tree.

I just dropped the patch from the akpm tree. The percpu tree patch looks
like it may be a later version.

--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature