Merge branch 'config' into late-for-linus