linux-next: manual merge of the slab tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

Hi all,

Today's linux-next merge of the slab tree got a conflict in mm/vmstat.c
between commit 556adecba110bf5f1db6c6b56416cfab5bcab698 ("vmscan: second
chance replacement for anonymous pages") from Linus' tree and commit
9fb8a023ad432b0ca884790a8a05991180ab42b6 ("slub: Trigger defragmentation
from memory reclaim") from the slab tree.

Just context changes.  I fixed it up (see below) and will carry the fix
for a few days (during which time I hope it is fixed in the slab tree).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc mm/vmstat.c
index 022418e,5efc2c5..0000000
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@@ -774,14 -731,14 +774,16 @@@ static void zoneinfo_show_print(struct 
  #endif
  	}
  	seq_printf(m,
+ 		   "\n  slab_defrag_count: %lu"
  		   "\n  all_unreclaimable: %u"
  		   "\n  prev_priority:     %i"
 -		   "\n  start_pfn:         %lu",
 +		   "\n  start_pfn:         %lu"
 +		   "\n  inactive_ratio:    %u",
- 			   zone_is_all_unreclaimable(zone),
+ 			zone->slab_defrag_counter,
+ 			zone_is_all_unreclaimable(zone),
  		   zone->prev_priority,
 -		   zone->zone_start_pfn);
 +		   zone->zone_start_pfn,
 +		   zone->inactive_ratio);
  	seq_putc(m, '\n');
  }