Merge remote-tracking branch 'regmap/for-7.0' into regmap-linus