Merge branches 'slab/cleanups' and 'slab/fixes' into for-linus