Merge branch 'hwmon-lock' into hwmon-staging