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

2013-06-04 Thread Tejun Heo
Hello, Sorry about that. Forgot that the series was already in -mm. Due to the interface change, the old aio patches won't work on top of the new percpu-ref patch. Kent is rebasing the rest but until then we need to either drop the aio patches from -mm or keep using the old percpu-ref patch. Given

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

2013-06-03 Thread Stephen Rothwell
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