* linux-next: manual merge of the perf tree with Linus' tree
@ 2021-10-26 22:17 Stephen Rothwell
2021-10-26 23:06 ` Arnaldo Carvalho de Melo
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2021-10-26 22:17 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Alexey Bayduraev, Arnaldo Carvalho de Melo,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1267 bytes --]
Hi all,
Today's linux-next merge of the perf tree got a conflict in:
tools/perf/util/session.c
between commit:
8e820f962345 ("perf report: Output non-zero offset for decompressed records")
from Linus' tree and commit:
3a3535e67dfd ("perf session: Introduce decompressor in reader object")
from the perf tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc tools/perf/util/session.c
index 352f16076e01,51bf2efceb7f..000000000000
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@@ -2116,8 -2122,8 +2122,8 @@@ fetch_decomp_event(u64 head, size_t mma
static int __perf_session__process_decomp_events(struct perf_session *session)
{
s64 skip;
- u64 size, file_pos = 0;
+ u64 size;
- struct decomp *decomp = session->decomp_last;
+ struct decomp *decomp = session->active_decomp->decomp_last;
if (!decomp)
return 0;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the perf tree with Linus' tree
2021-10-26 22:17 linux-next: manual merge of the perf tree with Linus' tree Stephen Rothwell
@ 2021-10-26 23:06 ` Arnaldo Carvalho de Melo
0 siblings, 0 replies; 5+ messages in thread
From: Arnaldo Carvalho de Melo @ 2021-10-26 23:06 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Alexey Bayduraev, Arnaldo Carvalho de Melo,
Linux Kernel Mailing List, Linux Next Mailing List
On October 26, 2021 7:17:05 PM GMT-03:00, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>Hi all,
>
>Today's linux-next merge of the perf tree got a conflict in:
>
> tools/perf/util/session.c
>
>between commit:
>
> 8e820f962345 ("perf report: Output non-zero offset for decompressed records")
>
>from Linus' tree and commit:
>
> 3a3535e67dfd ("perf session: Introduce decompressor in reader object")
>
>from the perf tree.
>
>I fixed it up (see below) and can carry the fix as necessary. This
>is now fixed as far as linux-next is concerned, but any non trivial
>conflicts should be mentioned to your upstream maintainer when your tree
>is submitted for merging. You may also want to consider cooperating
>with the maintainer of the conflicting tree to minimise any particularly
>complex conflicts.
>
Fixed locally, will publish tomorrow after regression tests finish.
- Arnaldo
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the perf tree with Linus' tree
2023-11-28 21:53 Stephen Rothwell
@ 2023-11-30 0:11 ` Namhyung Kim
0 siblings, 0 replies; 5+ messages in thread
From: Namhyung Kim @ 2023-11-30 0:11 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Arnaldo Carvalho de Melo, Arnaldo Carvalho de Melo,
Athira Jajeev, Linux Kernel Mailing List,
Linux Next Mailing List, Oliver Upton
Hello,
On Tue, Nov 28, 2023 at 1:53 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the perf tree got a conflict in:
>
> tools/perf/Makefile.perf
>
> between commit:
>
> e2bdd172e665 ("perf build: Generate arm64's sysreg-defs.h and add to include path")
>
> from Lius' tree and commit:
>
> 1638b11ef815 ("perf tools: Add perf binary dependent rule for shellcheck log in Makefile.perf")
>
> from the perf tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
Thanks for letting us know. I think Arnaldo can resolve the
conflict when he merges perf-tools into perf-tools-next later
(but before sending the changes for v6.8) as you did.
Thanks,
Namhyung
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc tools/perf/Makefile.perf
> index 058c9aecf608,824cbc0af7d7..000000000000
> --- a/tools/perf/Makefile.perf
> +++ b/tools/perf/Makefile.perf
> @@@ -1150,7 -1151,8 +1168,8 @@@ endif # CONFIG_PERF_BPF_SKE
> bpf-skel-clean:
> $(call QUIET_CLEAN, bpf-skel) $(RM) -r $(SKEL_TMP_OUT) $(SKELETONS)
>
> -clean:: $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clean $(LIBSYMBOL)-clean $(LIBPERF)-clean fixdep-clean python-clean bpf-skel-clean tests-coresight-targets-clean
> +clean:: $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clean $(LIBSYMBOL)-clean $(LIBPERF)-clean arm64-sysreg-defs-clean fixdep-clean python-clean bpf-skel-clean tests-coresight-targets-clean
> + $(Q)$(MAKE) -f $(srctree)/tools/perf/tests/Makefile.tests clean
> $(call QUIET_CLEAN, core-objs) $(RM) $(LIBPERF_A) $(OUTPUT)perf-archive $(OUTPUT)perf-iostat $(LANG_BINDINGS)
> $(Q)find $(or $(OUTPUT),.) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete
> $(Q)$(RM) $(OUTPUT).config-detected
^ permalink raw reply [flat|nested] 5+ messages in thread
* linux-next: manual merge of the perf tree with Linus' tree
@ 2023-11-28 21:53 Stephen Rothwell
2023-11-30 0:11 ` Namhyung Kim
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2023-11-28 21:53 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo, Namhyung Kim
Cc: Arnaldo Carvalho de Melo, Athira Jajeev,
Linux Kernel Mailing List, Linux Next Mailing List, Oliver Upton
[-- Attachment #1: Type: text/plain, Size: 1770 bytes --]
Hi all,
Today's linux-next merge of the perf tree got a conflict in:
tools/perf/Makefile.perf
between commit:
e2bdd172e665 ("perf build: Generate arm64's sysreg-defs.h and add to include path")
from Lius' tree and commit:
1638b11ef815 ("perf tools: Add perf binary dependent rule for shellcheck log in Makefile.perf")
from the perf tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc tools/perf/Makefile.perf
index 058c9aecf608,824cbc0af7d7..000000000000
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@@ -1150,7 -1151,8 +1168,8 @@@ endif # CONFIG_PERF_BPF_SKE
bpf-skel-clean:
$(call QUIET_CLEAN, bpf-skel) $(RM) -r $(SKEL_TMP_OUT) $(SKELETONS)
-clean:: $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clean $(LIBSYMBOL)-clean $(LIBPERF)-clean fixdep-clean python-clean bpf-skel-clean tests-coresight-targets-clean
+clean:: $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clean $(LIBSYMBOL)-clean $(LIBPERF)-clean arm64-sysreg-defs-clean fixdep-clean python-clean bpf-skel-clean tests-coresight-targets-clean
+ $(Q)$(MAKE) -f $(srctree)/tools/perf/tests/Makefile.tests clean
$(call QUIET_CLEAN, core-objs) $(RM) $(LIBPERF_A) $(OUTPUT)perf-archive $(OUTPUT)perf-iostat $(LANG_BINDINGS)
$(Q)find $(or $(OUTPUT),.) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete
$(Q)$(RM) $(OUTPUT).config-detected
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* linux-next: manual merge of the perf tree with Linus' tree
@ 2022-07-07 23:28 Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2022-07-07 23:28 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Arnaldo Carvalho de Melo, Linux Kernel Mailing List,
Linux Next Mailing List, Namhyung Kim, Ravi Bangoria
[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]
Hi all,
Today's linux-next merge of the perf tree got a conflict in:
tools/perf/util/evsel.c
between commit:
49c692b7dfc9 ("perf offcpu: Accept allowed sample types only")
from Linus' tree and commit:
9ab95b0b15a0 ("perf record ibs: Warn about sampling period skew")
from the perf tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc tools/perf/util/evsel.c
index 094b0a9c0bc0,8fea51a9cd90..000000000000
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@@ -1373,8 -1372,7 +1378,10 @@@ void evsel__config(struct evsel *evsel
if (evsel__is_dummy_event(evsel))
evsel__reset_sample_bit(evsel, BRANCH_STACK);
+ if (evsel__is_offcpu_event(evsel))
+ evsel->core.attr.sample_type &= OFFCPU_SAMPLE_TYPES;
++
+ arch__post_evsel_config(evsel, attr);
}
int evsel__set_filter(struct evsel *evsel, const char *filter)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-11-30 0:11 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-26 22:17 linux-next: manual merge of the perf tree with Linus' tree Stephen Rothwell
2021-10-26 23:06 ` Arnaldo Carvalho de Melo
2022-07-07 23:28 Stephen Rothwell
2023-11-28 21:53 Stephen Rothwell
2023-11-30 0:11 ` Namhyung Kim
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).