Merge branch 'rt6_probe_write_lock'