From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Apr 2018 19:09:27 +0000 (-0700)
Subject: Merge tag 'rproc-v4.17' of git://github.com/andersson/remoteproc
X-Git-Tag: v4.19~1234
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=92589cbdda677a84ca5e485e1083c7d3bdcfc7b9;p=platform%2Fkernel%2Flinux-rpi3.git

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

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
---

92589cbdda677a84ca5e485e1083c7d3bdcfc7b9
diff --cc samples/Makefile
index 70cf375,a30833a..bd601c0
--- a/samples/Makefile
+++ b/samples/Makefile
@@@ -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/