Merge branch 'for-linus' into for-next

This is a preliminary merge before the upcoming merge of generic parser
branch.