diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-30 11:11:09 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-30 11:11:09 -0400 |
| commit | 669c5d8d5f2be781d411ad8d52274038c795f257 (patch) | |
| tree | 86cc56ec1cb077b49e58f88c1427991e2b8fbcbc /tools/perf | |
| parent | c1a02c216044784f9871a5066fd22de7d0414d0d (diff) | |
| parent | 17b57b1883c1285f3d0dc2266e8f79286a7bef38 (diff) | |
Merge 4.19-rc6 into tty-next
We want the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/Documentation/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/Documentation/Makefile b/tools/perf/Documentation/Makefile index 42261a9b280e..ac841bc5c35b 100644 --- a/tools/perf/Documentation/Makefile +++ b/tools/perf/Documentation/Makefile | |||
| @@ -280,7 +280,7 @@ $(MAN_HTML): $(OUTPUT)%.html : %.txt | |||
| 280 | mv $@+ $@ | 280 | mv $@+ $@ |
| 281 | 281 | ||
| 282 | ifdef USE_ASCIIDOCTOR | 282 | ifdef USE_ASCIIDOCTOR |
| 283 | $(OUTPUT)%.1 $(OUTPUT)%.5 $(OUTPUT)%.7 : $(OUTPUT)%.txt | 283 | $(OUTPUT)%.1 $(OUTPUT)%.5 $(OUTPUT)%.7 : %.txt |
| 284 | $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ | 284 | $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ |
| 285 | $(ASCIIDOC) -b manpage -d manpage \ | 285 | $(ASCIIDOC) -b manpage -d manpage \ |
| 286 | $(ASCIIDOC_EXTRA) -aperf_version=$(PERF_VERSION) -o $@+ $< && \ | 286 | $(ASCIIDOC_EXTRA) -aperf_version=$(PERF_VERSION) -o $@+ $< && \ |