Merge tag 'rproc-v5.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/remote...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 27 Jan 2022 09:19:20 +0000 (11:19 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 27 Jan 2022 09:19:20 +0000 (11:19 +0200)
Pull remoteproc fix from Bjorn Andersson:
 "The interaction between the various Qualcomm remoteproc drivers and
  the Qualcomm 'QMP' driver (used to communicate with the
  power-management hardware) was reworked in v5.17-rc1, but failed to
  account for the new Kconfig dependency"

* tag 'rproc-v5.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux:
  remoteproc: qcom: q6v5: fix service routines build errors


Trivial merge