Merge branch 'for-next/pfn-valid' into for-next/core