Messages in this thread | | | Date | Mon, 7 Sep 2009 18:22:29 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the percpu tree with Linus' tree |
| |
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. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |