Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
mm/page_alloc.c between commit c67fe3752abe ("mm: compaction: Abort async
compaction if locks are contended or taking too long") from Linus' tree
and commit "mm: remove __GFP_NO_KSWAPD" from the akpm tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc mm/page_alloc.c
index 5b3cc33,cefac39..0000000
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@@ -2436,11 -2429,10 +2435,10 @@@ rebalance
  	/*
  	 * If compaction is deferred for high-order allocations, it is because
  	 * sync compaction recently failed. In this is the case and the caller
 -	 * has requested the system not be heavily disrupted, fail the
 -	 * allocation now instead of entering direct reclaim
 +	 * requested a movable allocation that does not heavily disrupt the
 +	 * system then fail the allocation instead of entering direct reclaim.
  	 */
- 	if ((deferred_compaction || contended_compaction) &&
- 						(gfp_mask & __GFP_NO_KSWAPD))
 -	if (deferred_compaction)
++	if (deferred_compaction || contended_compaction)
  		goto nopage;
  
  	/* Try direct reclaim and then allocating */