Merge branch 'net-smc-userspace-breakage-fixes'