Messages in this thread | | | Date | Fri, 7 Dec 2012 17:39:47 +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/vmscan.c between commit c702418f8a2f ("mm: vmscan: do not keep kswapd looping forever due to individual uncompactable zones") from Linus' tree and commit "mm: use IS_ENABLED(CONFIG_COMPACTION) instead of COMPACTION_BUILD" from the akpm tree.
The former removed part of the code modified by the latter, so I did that 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] | |