Merge branch 'slab/procfs' into slab/for-linus