Merge remote-tracking branch 'regulator/fix/s2mpa01' into regulator-linus