Merge tag 'rproc-v4.15' of git://github.com/andersson/remoteproc

Pull remoteproc updates from Bjorn Andersson:
 "This adds an interface for configuring Qualcomm's "secure SMMU" and
  adds support for booting the modem Hexagon on MSM8996.

  Two new debugfs entries are added in the remoteproc core to introspect
  the list of memory carveouts and the loaded resource table"

* tag 'rproc-v4.15' of git://github.com/andersson/remoteproc:
  remoteproc: qcom: Fix error handling paths in order to avoid memory leaks
  remoteproc: qcom: Drop pr_err in q6v5_xfer_mem_ownership()
  remoteproc: debug: add carveouts list dump feature
  remoteproc: debug: add resource table dump feature
  remoteproc: qcom: Add support for mss remoteproc on msm8996
  remoteproc: qcom: Make secure world call for mem ownership switch
  remoteproc: qcom: refactor mss fw image loading sequence
  firmware: scm: Add new SCM call API for switching memory ownership

diff --cc drivers/firmware/qcom_scm-32.c
Simple merge

diff --cc drivers/firmware/qcom_scm-64.c
Simple merge

diff --cc drivers/firmware/qcom_scm.c
index 9064e559a01f5050737de43d49df4f94df01b5a2,334eaa341828538334a45519d6721984914a77a7..af4c75217ea6647955ff28585b1e512b20eb258f
--- 1/drivers/firmware/qcom_scm.c
--- 2/drivers/firmware/qcom_scm.c
+++ b/drivers/firmware/qcom_scm.c
@@@ -43,10 -38,21 +43,23 @@@ struct qcom_scm 
        struct clk *iface_clk;
        struct clk *bus_clk;
        struct reset_controller_dev reset;
 +
 +      u64 dload_mode_addr;
  };
  
+ struct qcom_scm_current_perm_info {
+       __le32 vmid;
+       __le32 perm;
+       __le64 ctx;
+       __le32 ctx_size;
+       __le32 unused;
+ };
+ 
+ struct qcom_scm_mem_map_info {
+       __le64 mem_addr;
+       __le64 mem_size;
+ };
+ 
  static struct qcom_scm *__scm;
  
  static int qcom_scm_clk_enable(void)

diff --cc drivers/firmware/qcom_scm.h
Simple merge

diff --cc include/linux/qcom_scm.h
Simple merge