Merge tag 'rproc-v4.17' of git://github.com/andersson/remoteproc
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Apr 2018 19:09:27 +0000 (12:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Apr 2018 19:09:27 +0000 (12:09 -0700)
Pull remoteproc updates from Bjorn Andersson:

 - add support for generating coredumps for remoteprocs using
   devcoredump

 - add the Qualcomm sysmon driver for intra-remoteproc crash handling

 - a number of fixes in Qualcomm and IMX drivers

* tag 'rproc-v4.17' of git://github.com/andersson/remoteproc:
  remoteproc: fix null pointer dereference on glink only platforms
  soc: qcom: qmi: add CONFIG_NET dependency
  remoteproc: imx_rproc: Slightly simplify code in 'imx_rproc_probe()'
  remoteproc: imx_rproc: Re-use existing error handling path in 'imx_rproc_probe()'
  remoteproc: imx_rproc: Fix an error handling path in 'imx_rproc_probe()'
  samples: Introduce Qualcomm QMI sample client
  remoteproc: qcom: Introduce sysmon
  remoteproc: Pass type of shutdown to subdev remove
  remoteproc: qcom: Register segments for core dump
  soc: qcom: mdt-loader: Return relocation base
  remoteproc: Rename "load_rsc_table" to "parse_fw"
  remoteproc: Add remote processor coredump support
  remoteproc: Remove null character write of shared mem

1  2 
drivers/gpu/drm/msm/adreno/a5xx_gpu.c
drivers/soc/qcom/Kconfig
samples/Kconfig
samples/Makefile

Simple merge
Simple merge
diff --cc samples/Kconfig
Simple merge
index 70cf3758dcf2f91bddd2123ca029ee89e9140c3b,a30833a2a19e7a8be91b53fa4600499f8b377961..bd601c038b86f67e47fff54ae2dfe4eeab5fc3a6
@@@ -2,5 -2,5 +2,5 @@@
  
  obj-$(CONFIG_SAMPLES) += kobject/ kprobes/ trace_events/ livepatch/ \
                           hw_breakpoint/ kfifo/ kdb/ hidraw/ rpmsg/ seccomp/ \
 -                         configfs/ connector/ v4l/ trace_printk/ blackfin/ \
 +                         configfs/ connector/ v4l/ trace_printk/ \
-                          vfio-mdev/ statx/
+                          vfio-mdev/ statx/ qmi/