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