lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 22 Apr 2020 12:17:17 -0000 From: "tip-bot2 for Ian Rogers" <tip-bot2@...utronix.de> To: linux-tip-commits@...r.kernel.org Cc: Ian Rogers <irogers@...gle.com>, Adrian Hunter <adrian.hunter@...el.com>, Alexander Shishkin <alexander.shishkin@...ux.intel.com>, Alexei Starovoitov <ast@...nel.org>, Alexey Budankov <alexey.budankov@...ux.intel.com>, Andi Kleen <ak@...ux.intel.com>, Andrii Nakryiko <andriin@...com>, Daniel Borkmann <daniel@...earbox.net>, Florian Fainelli <f.fainelli@...il.com>, "Greg Kroah-Hartman" <gregkh@...uxfoundation.org>, Igor Lubashev <ilubashe@...mai.com>, Jin Yao <yao.jin@...ux.intel.com>, Jiri Olsa <jolsa@...hat.com>, Jiwei Sun <jiwei.sun@...driver.com>, John Garry <john.garry@...wei.com>, Kan Liang <kan.liang@...ux.intel.com>, Leo Yan <leo.yan@...aro.org>, Mark Rutland <mark.rutland@....com>, Martin KaFai Lau <kafai@...com>, Namhyung Kim <namhyung@...nel.org>, Peter Zijlstra <peterz@...radead.org>, Stephane Eranian <eranian@...gle.com>, Thomas Gleixner <tglx@...utronix.de>, Yonghong Song <yhs@...com>, bpf@...r.kernel.org, netdev@...r.kernel.org, yuzhoujian <yuzhoujian@...ichuxing.com>, Arnaldo Carvalho de Melo <acme@...hat.com>, x86 <x86@...nel.org>, LKML <linux-kernel@...r.kernel.org> Subject: [tip: perf/core] perf doc: allow ASCIIDOC_EXTRA to be an argument The following commit has been merged into the perf/core branch of tip: Commit-ID: e9cfa47e687d77d256610b7124d736776f137ea0 Gitweb: https://git.kernel.org/tip/e9cfa47e687d77d256610b7124d736776f137ea0 Author: Ian Rogers <irogers@...gle.com> AuthorDate: Thu, 16 Apr 2020 09:20:55 -07:00 Committer: Arnaldo Carvalho de Melo <acme@...hat.com> CommitterDate: Sat, 18 Apr 2020 09:05:00 -03:00 perf doc: allow ASCIIDOC_EXTRA to be an argument This will allow parent makefiles to pass values to asciidoc. Signed-off-by: Ian Rogers <irogers@...gle.com> Cc: Adrian Hunter <adrian.hunter@...el.com> Cc: Alexander Shishkin <alexander.shishkin@...ux.intel.com> Cc: Alexei Starovoitov <ast@...nel.org> Cc: Alexey Budankov <alexey.budankov@...ux.intel.com> Cc: Andi Kleen <ak@...ux.intel.com> Cc: Andrii Nakryiko <andriin@...com> Cc: Daniel Borkmann <daniel@...earbox.net> Cc: Florian Fainelli <f.fainelli@...il.com> Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org> Cc: Igor Lubashev <ilubashe@...mai.com> Cc: Jin Yao <yao.jin@...ux.intel.com> Cc: Jiri Olsa <jolsa@...hat.com> Cc: Jiwei Sun <jiwei.sun@...driver.com> Cc: John Garry <john.garry@...wei.com> Cc: Kan Liang <kan.liang@...ux.intel.com> Cc: Leo Yan <leo.yan@...aro.org> Cc: Mark Rutland <mark.rutland@....com> Cc: Martin KaFai Lau <kafai@...com> Cc: Namhyung Kim <namhyung@...nel.org> Cc: Peter Zijlstra <peterz@...radead.org> Cc: Stephane Eranian <eranian@...gle.com> Cc: Thomas Gleixner <tglx@...utronix.de> Cc: Yonghong Song <yhs@...com> Cc: bpf@...r.kernel.org Cc: netdev@...r.kernel.org Cc: yuzhoujian <yuzhoujian@...ichuxing.com> Link: http://lore.kernel.org/lkml/20200416162058.201954-2-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com> --- tools/perf/Documentation/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/Documentation/Makefile b/tools/perf/Documentation/Makefile index 31824d5..6e54979 100644 --- a/tools/perf/Documentation/Makefile +++ b/tools/perf/Documentation/Makefile @@ -48,7 +48,7 @@ man5dir=$(mandir)/man5 man7dir=$(mandir)/man7 ASCIIDOC=asciidoc -ASCIIDOC_EXTRA = --unsafe -f asciidoc.conf +ASCIIDOC_EXTRA += --unsafe -f asciidoc.conf ASCIIDOC_HTML = xhtml11 MANPAGE_XSL = manpage-normal.xsl XMLTO_EXTRA = @@ -59,7 +59,7 @@ HTML_REF = origin/html ifdef USE_ASCIIDOCTOR ASCIIDOC = asciidoctor -ASCIIDOC_EXTRA = -a compat-mode +ASCIIDOC_EXTRA += -a compat-mode ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions ASCIIDOC_EXTRA += -a mansource="perf" -a manmanual="perf Manual" ASCIIDOC_HTML = xhtml5
Powered by blists - more mailing lists