Hi
> Today's linux-next merge of the slab tree got a conflict in mm/vmscan.c
> between commit 4f98a2fee8acdb4ac84545df98cccecfd130f8db ("vmscan: split
> LRU lists into anon & file sets") from Linus' tree and commit
> 9fb8a023ad432b0ca884790a8a05991180ab42b6 ("slub: Trigger defragmentation
> from memory reclaim") from the slab tree.
>
> Overlapping changes. I fixed it up (see below) and will carry the fix
> for a few days (during which time I hope it will be fixed in the slab
> tree).
looks good to me.
thanks, stephen.
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
