Merge tag 'v4.2' into for_next

Linux 4.2