diff options
| author | David S. Miller <davem@davemloft.net> | 2014-05-12 17:19:14 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-05-12 17:19:14 (GMT) |
| commit | 5f013c9bc70214dcacd5fbed5a06c217d6ff9c59 (patch) | |
| tree | 34c3a633000e03bca57d0ce55d8759f86edecc03 /tools/perf/builtin-record.c | |
| parent | 51ee42efa0829cf9e46f8e1c0ab7a9ab6facf3f2 (diff) | |
| parent | 1a466ae96e9f749d02a73315a3e66375e61a61dd (diff) | |
| download | linux-5f013c9bc70214dcacd5fbed5a06c217d6ff9c59.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/altera/altera_sgdma.c
net/netlink/af_netlink.c
net/sched/cls_api.c
net/sched/sch_api.c
The netlink conflict dealt with moving to netlink_capable() and
netlink_ns_capable() in the 'net' tree vs. supporting 'tc' operations
in non-init namespaces. These were simple transformations from
netlink_capable to netlink_ns_capable.
The Altera driver conflict was simply code removal overlapping some
void pointer cast cleanups in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/perf/builtin-record.c')
| -rw-r--r-- | tools/perf/builtin-record.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index eb524f9..8ce62ef 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -374,7 +374,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) session = perf_session__new(file, false, NULL); if (session == NULL) { - pr_err("Not enough memory for reading perf file header\n"); + pr_err("Perf session creation failed.\n"); return -1; } |