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

[Tejun Heo]

Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the percpu tree got a conflict in mm/percpu.c
> between commit 04a13c7c632e1fe04a5f6e6c83565d2559e37598 ("percpu: don't
> assume existence of cpu0") from Linus' tree and commit pcpu_chunk_page_occupied ("percpu: drop pcpu_chunk->page[]") from the percpu tree.
> 
> I *think* the changes in the percpu tree supercede those in Linus' tree,
> so I have used those.

Yes, the changes in Linus's tree are backported from devel branch but
the devel already has moved on and dropped one of the changes.  I'll
merge Linus's tree into percpu devel branch.

Thanks.

-- 
tejun
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/