Hi all,
The following commits are also in the perf-current tree as different
commits (but the same patches):
6236ebe07131 ("perf daemon: Fix the build on more 32-bit architectures")
2518e13275ab ("perf python: Fix the build on 32-bit arm by including missing "util/sample.h"")
74fd69a35cae ("perf lock contention: Fix spinlock and rwlock accounting")
37e2a19c98bf ("perf test pmu: Set uninitialized PMU alias to null")
These are commits
478e3c7ebbe7 ("perf daemon: Fix the build on more 32-bit architectures")
4cb80590f12d ("perf python: include "util/sample.h"")
60f47d2c58cb ("perf lock contention: Fix spinlock and rwlock accounting")
387ad33e5410 ("perf test pmu: Set uninitialized PMU alias to null")
and this last one is causing an unnecessary conflict.
--
Cheers,
Stephen Rothwell
Attachment:
pgpTJFNIv9AAx.pgp
Description: OpenPGP digital signature
