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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 487 bytes --]

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

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[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 that other subsystems are scheduled to pull in the
percpu-ref patch and build on top and Kent is working to rebase the
series, we probably should drop the series from -mm. Andrew?

Thanks and sorry about the trouble.

--
tejun