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

Mon, 03 Jun 2013 22:44:47 -0700 

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                    s...@canb.auug.org.au

Attachment: pgpid7YYe0ZOJ.pgp
Description: PGP signature

Reply via email to