Merge branch 'topic/qcom_hidma' into for-linus