Merge remote-tracking branches 'regmap/fix/header' and 'regmap/fix/macro' into regmap...