Subject: linux-next: manual merge of the akpm-current tree with the tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 21 Jan 2015 18:14:25 +1100

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
mm/swap.c between commit 97b713ba3eba ("fs: kill BDI_CAP_SWAP_BACKED")
from the block tree and commit f69ec11fad9f ("rmap: drop support of
non-linear mappings") from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc mm/swap.c
index 4e0109a2f37b,5b3087228b99..000000000000
--- a/mm/swap.c
+++ b/mm/swap.c
@@@ -1138,10 -1138,10 +1138,8 @@@ void __init swap_setup(void
  #ifdef CONFIG_SWAP
  	int i;
  
- 	for (i = 0; i < MAX_SWAPFILES; i++) {
 -	if (bdi_init(swapper_spaces[0].backing_dev_info))
 -		panic("Failed to init swap bdi");
+ 	for (i = 0; i < MAX_SWAPFILES; i++)
  		spin_lock_init(&swapper_spaces[i].tree_lock);
- 		INIT_LIST_HEAD(&swapper_spaces[i].i_mmap_nonlinear);
- 	}
  #endif
  
  	/* Use a smaller cluster for small-memory machines */