-next merged with Linus tree