Em Sat, Aug 13, 2022 at 03:10:18PM -0300, Arnaldo Carvalho de Melo escreveu:
Em Sat, Aug 13, 2022 at 10:17:39PM +0800, Leo Yan escreveu:
On Fri, Aug 12, 2022 at 04:02:50PM -0300, Arnaldo Carvalho de Melo wrote: So with fixing the merging conflict:
Tested-by: Leo Yan leo.yan@linaro.org Reviewed-by: Leo Yan leo.yan@linaro.org
[PATCH v7 14/14] perf test: Add relevant documentation about CoreSight testing + Tested-by: Leo Yan leo.yan@linaro.org (✓ DKIM/linaro.org) + Reviewed-by: Leo Yan leo.yan@linaro.org (✓ DKIM/linaro.org)
Total patches: 14
NOTE: some trailers ignored due to from/email mismatches: ! Trailer: Link: https://lore.kernel.org/r/20220728145256.2985298-1-carsten.haitzler@foss.arm... Msg From: Arnaldo Carvalho de Melo acme@kernel.org NOTE: Rerun with -S to apply them anyway
Cover: ./v7_20220812_carsten_haitzler_perf_test_add_trace_data_quality_tests_for_coresight.cover Link: https://lore.kernel.org/r/20220812121641.336465-1-carsten.haitzler@foss.arm.... Base: not specified git am ./v7_20220812_carsten_haitzler_perf_test_add_trace_data_quality_tests_for_coresight.mbx ⬢[acme@toolbox perf]$ git am ./v7_20220812_carsten_haitzler_perf_test_add_trace_data_quality_tests_for_coresight.mbx Applying: perf test: Refactor shell tests allowing subdirs .git/rebase-apply/patch:56: trailing whitespace. /* warning: 1 line adds whitespace errors. tools/perf/tests/builtin-test-list.c:29: trailing whitespace. +/* ⬢[acme@toolbox perf]$
Fixing...
After that:
⬢[acme@toolbox perf]$ git am ./v7_20220812_carsten_haitzler_perf_test_add_trace_data_quality_tests_for_coresight.mbx Applying: perf test: Refactor shell tests allowing subdirs Applying: perf test: Add CoreSight shell lib shared code for future tests Applying: perf test: Add build infra for perf test tools for CoreSight tests error: patch failed: tools/perf/Makefile.perf:1015 error: tools/perf/Makefile.perf: patch does not apply .git/rebase-apply/patch:109: new blank line at EOF. + Patch failed at 0003 perf test: Add build infra for perf test tools for CoreSight tests hint: Use 'git am --show-current-patch=diff' to see the failed patch 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". ⬢[acme@toolbox perf]$
Fixing...