Merge tag 'hdq-fix' into omap-for-v5.6/fixes-rc2