From: Patchwork <patchwork@emeril.freedesktop.org>
To: "Alexey Budankov" <alexey.budankov@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] ✗ Fi.CI.BUILD: failure for Introduce CAP_SYS_PERFMON to secure system performance monitoring and observability (rev3)
Date: Wed, 18 Dec 2019 10:11:59 -0000 [thread overview]
Message-ID: <157666391947.8354.1372113839059377700@emeril.freedesktop.org> (raw)
In-Reply-To: <c0460c78-b1a6-b5f7-7119-d97e5998f308@linux.intel.com>
== Series Details ==
Series: Introduce CAP_SYS_PERFMON to secure system performance monitoring and observability (rev3)
URL : https://patchwork.freedesktop.org/series/70961/
State : failure
== Summary ==
Applying: capabilities: introduce CAP_SYS_PERFMON to kernel and user space
Applying: perf/core: open access for CAP_SYS_PERFMON privileged process
Applying: perf tool: extend Perf tool with CAP_SYS_PERFMON capability support
Applying: drm/i915/perf: open access for CAP_SYS_PERFMON privileged process
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/i915_perf.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_perf.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_perf.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0004 drm/i915/perf: open access for CAP_SYS_PERFMON privileged process
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2019-12-18 10:12 UTC|newest]
Thread overview: 148+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-18 9:16 [PATCH v4 0/7] Introduce CAP_SYS_PERFMON to secure system performance monitoring and observability Alexey Budankov
2019-12-18 9:16 ` [Intel-gfx] " Alexey Budankov
2019-12-18 9:16 ` Alexey Budankov
2019-12-18 9:16 ` Alexey Budankov
2019-12-18 9:16 ` Alexey Budankov
2019-12-18 9:24 ` [PATCH v4 1/9] capabilities: introduce CAP_SYS_PERFMON to kernel and user space Alexey Budankov
2019-12-18 9:24 ` [Intel-gfx] " Alexey Budankov
2019-12-18 9:24 ` Alexey Budankov
2019-12-18 9:24 ` Alexey Budankov
2019-12-18 9:24 ` Alexey Budankov
2019-12-18 19:56 ` Stephen Smalley
2019-12-18 19:56 ` [Intel-gfx] " Stephen Smalley
2019-12-18 19:56 ` Stephen Smalley
2019-12-18 19:56 ` Stephen Smalley
2019-12-18 19:56 ` Stephen Smalley
2019-12-28 3:53 ` Serge E. Hallyn
2019-12-28 3:53 ` [Intel-gfx] " Serge E. Hallyn
2019-12-28 3:53 ` Serge E. Hallyn
2019-12-28 3:53 ` Serge E. Hallyn
2020-01-13 20:25 ` Song Liu
2020-01-13 20:25 ` [Intel-gfx] " Song Liu
2020-01-13 20:25 ` Song Liu
2020-01-13 20:25 ` Song Liu
2019-12-18 9:25 ` [PATCH v4 2/9] perf/core: open access for CAP_SYS_PERFMON privileged process Alexey Budankov
2019-12-18 9:25 ` [Intel-gfx] " Alexey Budankov
2019-12-18 9:25 ` Alexey Budankov
2019-12-18 9:25 ` Alexey Budankov
2019-12-18 9:25 ` Alexey Budankov
2020-01-08 16:07 ` Peter Zijlstra
2020-01-08 16:07 ` [Intel-gfx] " Peter Zijlstra
2020-01-08 16:07 ` Peter Zijlstra
2020-01-08 16:07 ` Peter Zijlstra
2020-01-08 16:07 ` Peter Zijlstra
2020-01-09 11:36 ` Alexey Budankov
2020-01-09 11:36 ` [Intel-gfx] " Alexey Budankov
2020-01-09 11:36 ` Alexey Budankov
2020-01-09 11:36 ` Alexey Budankov
2020-01-09 11:36 ` Alexey Budankov
2020-01-10 14:02 ` Peter Zijlstra
2020-01-10 14:02 ` [Intel-gfx] " Peter Zijlstra
2020-01-10 14:02 ` Peter Zijlstra
2020-01-10 14:02 ` Peter Zijlstra
2020-01-10 15:52 ` Masami Hiramatsu
2020-01-10 15:52 ` [Intel-gfx] " Masami Hiramatsu
2020-01-10 15:52 ` Masami Hiramatsu
2020-01-10 15:52 ` Masami Hiramatsu
2020-01-10 16:45 ` Arnaldo Carvalho de Melo
2020-01-10 16:45 ` [Intel-gfx] " Arnaldo Carvalho de Melo
2020-01-10 16:45 ` Arnaldo Carvalho de Melo
2020-01-10 16:45 ` Arnaldo Carvalho de Melo
2020-01-10 23:47 ` Masami Hiramatsu
2020-01-10 23:47 ` [Intel-gfx] " Masami Hiramatsu
2020-01-10 23:47 ` Masami Hiramatsu
2020-01-10 23:47 ` Masami Hiramatsu
2020-01-11 0:23 ` Song Liu
2020-01-11 0:23 ` [Intel-gfx] " Song Liu
2020-01-11 0:23 ` Song Liu
2020-01-11 0:23 ` Song Liu
2020-01-11 0:35 ` arnaldo.melo
2020-01-11 0:35 ` [Intel-gfx] " arnaldo.melo
2020-01-11 9:57 ` Alexey Budankov
2020-01-13 20:39 ` Song Liu
2020-01-14 3:25 ` Masami Hiramatsu
2020-01-14 5:17 ` Alexei Starovoitov
2020-01-14 9:47 ` Alexey Budankov
2020-01-14 18:06 ` Alexei Starovoitov
2020-01-14 18:50 ` Alexey Budankov
2020-01-15 1:52 ` Alexei Starovoitov
2020-01-15 5:15 ` Alexey Budankov
2020-04-01 20:50 ` Alexey Budankov
2020-04-03 13:55 ` Alexey Budankov
2020-04-03 13:56 ` Alexey Budankov
2020-01-15 9:45 ` Masami Hiramatsu
2020-01-15 12:11 ` Alexey Budankov
2020-01-14 12:04 ` Masami Hiramatsu
2020-01-12 1:44 ` Masami Hiramatsu
2020-01-12 1:44 ` [Intel-gfx] " Masami Hiramatsu
2020-01-12 1:44 ` Masami Hiramatsu
2020-01-10 16:41 ` Alexey Budankov
2020-01-10 16:41 ` [Intel-gfx] " Alexey Budankov
2020-01-10 16:41 ` Alexey Budankov
2020-01-10 16:41 ` Alexey Budankov
2020-01-10 17:34 ` Alexey Budankov
2020-01-10 17:34 ` [Intel-gfx] " Alexey Budankov
2020-01-10 17:34 ` Alexey Budankov
2020-01-10 17:34 ` Alexey Budankov
2020-04-01 20:49 ` Alexey Budankov
2020-04-03 14:28 ` Alexey Budankov
2019-12-18 9:26 ` [PATCH v4 3/9] perf tool: extend Perf tool with CAP_SYS_PERFMON capability support Alexey Budankov
2019-12-18 9:26 ` [Intel-gfx] " Alexey Budankov
2019-12-18 9:26 ` Alexey Budankov
2019-12-18 9:26 ` Alexey Budankov
2019-12-18 9:26 ` Alexey Budankov
2019-12-18 9:27 ` [PATCH v4 4/9] drm/i915/perf: open access for CAP_SYS_PERFMON privileged process Alexey Budankov
2019-12-18 9:27 ` [Intel-gfx] " Alexey Budankov
2019-12-18 9:27 ` Alexey Budankov
2019-12-18 9:27 ` Alexey Budankov
2019-12-18 9:27 ` Alexey Budankov
2019-12-19 9:10 ` Lionel Landwerlin
2019-12-19 9:10 ` [Intel-gfx] " Lionel Landwerlin
2019-12-19 9:10 ` Lionel Landwerlin
2019-12-19 9:10 ` Lionel Landwerlin
2019-12-19 9:10 ` Lionel Landwerlin
2019-12-18 9:28 ` [PATCH v4 5/9] trace/bpf_trace: " Alexey Budankov
2019-12-18 9:28 ` [Intel-gfx] " Alexey Budankov
2019-12-18 9:28 ` Alexey Budankov
2019-12-18 9:28 ` Alexey Budankov
2019-12-18 9:28 ` Alexey Budankov
2020-01-13 20:47 ` Song Liu
2020-01-13 20:47 ` [Intel-gfx] " Song Liu
2020-01-13 20:47 ` Song Liu
2020-01-13 20:47 ` Song Liu
2019-12-18 9:28 ` [PATCH v4 6/9] powerpc/perf: " Alexey Budankov
2019-12-18 9:28 ` [Intel-gfx] " Alexey Budankov
2019-12-18 9:28 ` Alexey Budankov
2019-12-18 9:28 ` Alexey Budankov
2019-12-18 9:28 ` Alexey Budankov
2019-12-18 9:29 ` [PATCH v4 7/9] parisc/perf: " Alexey Budankov
2019-12-18 9:29 ` [Intel-gfx] " Alexey Budankov
2019-12-18 9:29 ` Alexey Budankov
2019-12-18 9:29 ` Alexey Budankov
2019-12-18 9:29 ` Alexey Budankov
2020-01-27 8:52 ` Helge Deller
2020-01-27 8:52 ` [Intel-gfx] " Helge Deller
2020-01-27 8:52 ` Helge Deller
2020-01-27 8:52 ` Helge Deller
2020-01-27 8:52 ` Helge Deller
2019-12-18 9:30 ` [PATCH v4 8/9] drivers/perf: " Alexey Budankov
2019-12-18 9:30 ` [Intel-gfx] " Alexey Budankov
2019-12-18 9:30 ` Alexey Budankov
2019-12-18 9:30 ` Alexey Budankov
2019-12-18 9:30 ` Alexey Budankov
2020-01-17 10:51 ` Will Deacon
2020-01-17 10:51 ` [Intel-gfx] " Will Deacon
2020-01-17 10:51 ` Will Deacon
2020-01-17 10:51 ` Will Deacon
2020-01-17 21:33 ` Alexey Budankov
2020-01-17 21:33 ` [Intel-gfx] " Alexey Budankov
2020-01-17 21:33 ` Alexey Budankov
2020-01-17 21:33 ` Alexey Budankov
2020-01-18 18:48 ` Alexey Budankov
2020-01-18 18:48 ` Alexey Budankov
2019-12-18 9:31 ` [PATCH v4 9/9] drivers/oprofile: " Alexey Budankov
2019-12-18 9:31 ` [Intel-gfx] " Alexey Budankov
2019-12-18 9:31 ` Alexey Budankov
2019-12-18 9:31 ` Alexey Budankov
2019-12-18 9:31 ` Alexey Budankov
2019-12-18 10:11 ` Patchwork [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=157666391947.8354.1372113839059377700@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=alexey.budankov@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.