Messages in this thread | | | Date | Tue, 22 Nov 2011 17:17:17 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm tree with the arm tree |
| |
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in mm/vmalloc.c between commit be9b7335e706 ("mm: add vm_area_add_early()") from the arm tree and commit "mm: add vm_area_add_early()" from the akpm tree.
These are clearly meant to be the same patch, so I dropped the version from the akpm tree. (The arm version has a "BUG_ON(vmap_initialized);" at the start of vm_area_add_early()).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |