Messages in this thread | | | Date | Mon, 26 Nov 2012 23:34:13 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm tree with Linus' tree |
| |
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in mm/page_alloc.c between commit 5576646f3c1a ("revert "mm: fix-up zone present pages"") from Linus' tree and commit "mm: fix a regression with HIGHMEM" from the akpm tree.
I fixed it up (by dropping the akpm tree patch) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |