Merge remote-tracking branch 'vfs/for-next'

diff --cc drivers/gpu/drm/i915/i915_dma.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem.c
Simple merge

diff --cc fs/internal.h
Simple merge

diff --cc fs/nfs/internal.h
Simple merge

diff --cc fs/xfs/xfs_icache.c
Simple merge

diff --cc fs/xfs/xfs_icache.h
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc kernel/sysctl.c
Simple merge

diff --cc mm/huge_memory.c
Simple merge

diff --cc mm/memory-failure.c
Simple merge

diff --cc mm/vmscan.c
index fe715daeb8bc8288b0991be836a3dbcd60cebc85,e36454220614e9af2e87c1f1914e8746247c9a78..beb35778c69f147e47c30b44ee151953c68c4969
--- 1/mm/vmscan.c
--- 2/mm/vmscan.c
+++ b/mm/vmscan.c
@@@ -2829,9 -2854,11 +2867,11 @@@ static bool kswapd_shrink_zone(struct z
                return true;
  
        shrink_zone(zone, sc);
+       nodes_clear(shrink.nodes_to_scan);
+       node_set(zone_to_nid(zone), shrink.nodes_to_scan);
  
        reclaim_state->reclaimed_slab = 0;
 -      nr_slab = shrink_slab(&shrink, sc->nr_scanned, lru_pages);
 +      shrink_slab(&shrink, sc->nr_scanned, lru_pages);
        sc->nr_reclaimed += reclaim_state->reclaimed_slab;
  
        /* Account for the number of pages attempted to reclaim */