linux-next: manual merge of the drm-msm tree with the qcom tree

[Mark Brown]

Hi all,

Today's linux-next merge of the drm-msm tree got a conflict in:

  include/linux/firmware/qcom/qcom_scm.h

between commits:

  158ed777e330e ("firmware: qcom: scm: Add gpu_init_regs call")
  178e19c0df1b1 ("firmware: qcom: scm: add support for SHM bridge operations")

from the qcom tree and commit:

  90c3e2bc9ecbf ("firmware: qcom_scm: Add gpu_init_regs call")

from the drm-msm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc include/linux/firmware/qcom/qcom_scm.h
index 9f14976399ab8,a221a643dc12a..0000000000000
--- a/include/linux/firmware/qcom/qcom_scm.h
+++ b/include/linux/firmware/qcom/qcom_scm.h

Attachment: signature.asc
Description: PGP signature