Merge "msm: smd_tty: add separate port locking"