Merge remote-tracking branch 'qcom_sm8250/lineage-20' into lineage-21

Change-Id: I3159ae2c81329a81f9f6d4feba3fd1324a86b4f6

drivers/base/core.c

@@ -1684,8 +1684,11 @@ static ssize_t uevent_show(struct device *dev, struct device_attribute *attr,
 	if (!env)
 		return -ENOMEM;
 
+	/* Synchronize with really_probe() */
+	device_lock(dev);
 	/* let the kset specific function add its keys */
 	retval = kset->uevent_ops->uevent(kset, &dev->kobj, env);
+	device_unlock(dev);
 	if (retval)
 		goto out;