diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-10 12:09:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-10 12:09:27 -0700 |
| commit | 92589cbdda677a84ca5e485e1083c7d3bdcfc7b9 (patch) | |
| tree | 3ba481707efe11a28d2cb27f8bacfde4224ad6cd /samples/Makefile | |
| parent | 9ab89c407d904c284558bbcd285eb3baef9d8c07 (diff) | |
| parent | 730b2ad8f72898029160a6832141ba954122a0c8 (diff) | |
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
Diffstat (limited to 'samples/Makefile')
| -rw-r--r-- | samples/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/samples/Makefile b/samples/Makefile index 70cf3758dcf2..bd601c038b86 100644 --- a/samples/Makefile +++ b/samples/Makefile @@ -3,4 +3,4 @@ obj-$(CONFIG_SAMPLES) += kobject/ kprobes/ trace_events/ livepatch/ \ hw_breakpoint/ kfifo/ kdb/ hidraw/ rpmsg/ seccomp/ \ configfs/ connector/ v4l/ trace_printk/ \ - vfio-mdev/ statx/ + vfio-mdev/ statx/ qmi/ |