Merge branch 'bkl' into for-linus