Merge branch 'swp' (early part) into for-next