Merge branch 'regmap-4.17' into regmap-4.18 for the merge window